diff --git a/app/controllers/plans_controller.rb b/app/controllers/plans_controller.rb
index e5db539..f844cbd 100644
--- a/app/controllers/plans_controller.rb
+++ b/app/controllers/plans_controller.rb
@@ -85,15 +85,15 @@
if !default.nil? && default == @plan.template
# We used the generic/default template
- msg += _('This plan is based on the default template.')
+ msg += " #{_('This plan is based on the default template.')}"
elsif !@plan.template.customization_of.nil?
# We used a customized version of the the funder template
- msg += "#{_('This plan is based on the')} #{plan_params[:funder_name]} #{_('template with customisations by the')} #{plan_params[:org_name]}"
+ msg += " #{_('This plan is based on the')} #{plan_params[:funder_name]} #{_('template with customisations by the')} #{plan_params[:org_name]}"
else
# We used the specified org's or funder's template
- msg += "#{_('This plan is based on the')} #{@plan.template.org.name} template."
+ msg += " #{_('This plan is based on the')} #{@plan.template.org.name} template."
end
flash[:notice] = msg
@@ -208,6 +208,8 @@
authorize @plan
attrs = plan_params
+# attrs[:visibility] = attrs[:visibility].to_sym
+
# Save the guidance group selections
guidance_group_ids = params[:guidance_group_ids].blank? ? [] : params[:guidance_group_ids].map(&:to_i)
save_guidance_selections(guidance_group_ids)
@@ -239,6 +241,7 @@
@plan = Plan.find(params[:id])
authorize @plan
@visibility = @plan.visibility.present? ? @plan.visibility.to_s : Rails.application.config.default_plan_visibility
+ @allow_visibility = (@plan.num_answered_questions >= 1 && !@plan.is_test?)
end
@@ -412,6 +415,17 @@
end
end
+ def set_test
+ plan = Plan.find(params[:id])
+ authorize plan
+ plan.visibility = "#{plan_params[:visibility]}"
+ if plan.save
+ render json: {code: 1, msg: (plan.is_test? ? _('Your project is now a test.') : _('Your project is no longer a test.') )}
+ else
+ render json: {code: 0, msg: _("Unable to change the plan's test status")}
+ end
+ end
+
private
diff --git a/app/helpers/plans_helper.rb b/app/helpers/plans_helper.rb
index c4f3af4..d61258d 100644
--- a/app/helpers/plans_helper.rb
+++ b/app/helpers/plans_helper.rb
@@ -42,8 +42,10 @@
return "#{_('Institution')}"
when 'publicly_visible'
return "#{_('Public')}"
+ when 'privately_visible'
+ return "#{_('Private')}"
else
- return "#{_('Private')}" # Both Test and Private
+ return "#{_('N/A')}" # Test Plans
end
end
diff --git a/app/policies/plan_policy.rb b/app/policies/plan_policy.rb
index e6d6d15..448a3c4 100644
--- a/app/policies/plan_policy.rb
+++ b/app/policies/plan_policy.rb
@@ -56,6 +56,10 @@
@plan.administerable_by?(@user.id)
end
+ def set_test?
+ @plan.administerable_by?(@user.id)
+ end
+
# TODO: These routes are no lonmger used
=begin
def section_answers?
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index db53c0d..86bdedf 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -63,14 +63,17 @@
<%= render "layouts/header" %>
-