diff --git a/app/controllers/settings/plans_controller.rb b/app/controllers/settings/plans_controller.rb index c9a4adb..2c65aea 100644 --- a/app/controllers/settings/plans_controller.rb +++ b/app/controllers/settings/plans_controller.rb @@ -5,7 +5,7 @@ after_action :verify_authorized def show - authorize [:settings, plan] + authorize @plan respond_to do |format| format.html format.partial @@ -13,10 +13,10 @@ end def update - authorize [:settings, plan] + authorize @plan export_params = params[:export].try(:deep_symbolize_keys) - settings = plan.super_settings(:export).tap do |s| + settings = @plan.super_settings(:export).tap do |s| if params[:commit] == 'Reset' s.formatting = nil s.fields = nil @@ -29,7 +29,7 @@ if settings.save respond_to do |format| - format.html { redirect_to(export_project_path(plan.project)) } + format.html { redirect_to(export_project_path(@plan.project)) } end else settings.formatting = nil @@ -41,6 +41,8 @@ private def get_settings + @plan = Plan.find(params[:id]) + @export_settings = plan.settings(:export) end diff --git a/app/views/shared/_export_links.html.erb b/app/views/shared/_export_links.html.erb index 28f9fcb..a031c6c 100644 --- a/app/views/shared/_export_links.html.erb +++ b/app/views/shared/_export_links.html.erb @@ -6,6 +6,6 @@
-

Settings <%= plan_settings_indicator(plan) -%>

+

Export Settings <%= plan_settings_indicator(plan) -%>

<%= render(partial: "settings/plans/export_formatting_form", locals: { plan: plan }) %>