diff --git a/app/controllers/plans_controller.rb b/app/controllers/plans_controller.rb index 85396a9..0db2114 100644 --- a/app/controllers/plans_controller.rb +++ b/app/controllers/plans_controller.rb @@ -109,6 +109,7 @@ # GET /plans/show def show + puts 'plans#show' @plan = Plan.eager_load(params[:id]) authorize @plan @@ -352,6 +353,12 @@ end end + def show_export + @plan = Plan.find(params[:id]) + authorize @plan + render 'show_export' + end + def export @plan = Plan.find(params[:id]) authorize @plan diff --git a/app/policies/plan_policy.rb b/app/policies/plan_policy.rb index cb43258..98256fe 100644 --- a/app/policies/plan_policy.rb +++ b/app/policies/plan_policy.rb @@ -28,6 +28,9 @@ @plan.readable_by?(@user.id) end + def show_export? + @plan.readable_by?(@user.id) + end def update? @plan.editable_by?(@user.id) end diff --git a/app/views/phases/edit.html.erb b/app/views/phases/edit.html.erb index 7563044..f1fc89a 100644 --- a/app/views/phases/edit.html.erb +++ b/app/views/phases/edit.html.erb @@ -141,9 +141,10 @@
- <%= _('Export') %> + <%= _('Export') %>
-<%= render :partial => "plans/export", locals: {plan: @plan, plan_data: @plan_data} %> + +<%= render :partial => "plans/export", locals: {plan: @plan, plan_data: @plan_data, phase: @phase } %> <% session.delete(:question_id_comments)%> diff --git a/app/views/plans/_export.html.erb b/app/views/plans/_export.html.erb index 2d53826..b33c2ea 100644 --- a/app/views/plans/_export.html.erb +++ b/app/views/plans/_export.html.erb @@ -1,4 +1,4 @@ -