diff --git a/app/controllers/submissions_export_controller.rb b/app/controllers/submissions_export_controller.rb index bfbb7359..d199e585 100644 --- a/app/controllers/submissions_export_controller.rb +++ b/app/controllers/submissions_export_controller.rb @@ -5,10 +5,11 @@ class SubmissionsExportController < ApplicationController load_and_authorize_resource :submission, through: :template, parent: false, only: :index def index - submissions = @submissions.active - .preload(submitters: { documents_attachments: :blob, - attachments_attachments: :blob }) - .order(id: :asc) + submissions = params[:archived] == 'true' ? @submissions.archived : @submissions.active + + submissions = submissions.preload(submitters: { documents_attachments: :blob, + attachments_attachments: :blob }) + .order(id: :asc) submissions = Submissions.search(current_user, submissions, params[:q], search_values: true) submissions = Submissions::Filter.call(submissions, current_user, params) diff --git a/app/views/submissions_export/new.html.erb b/app/views/submissions_export/new.html.erb index 7b2df9b6..38121609 100644 --- a/app/views/submissions_export/new.html.erb +++ b/app/views/submissions_export/new.html.erb @@ -1,4 +1,4 @@ -<% filter_params = params.permit(:q, *Submissions::Filter::ALLOWED_PARAMS) %> +<% filter_params = params.permit(:q, :archived, *Submissions::Filter::ALLOWED_PARAMS) %> <%= render 'shared/turbo_modal', title: t('export'), close_after_submit: false do %>
<%= button_to template_submissions_export_index_path(@template), params: { format: :xlsx, **filter_params }, method: :get, data: { turbo_frame: :_top } do %> diff --git a/app/views/templates_archived_submissions/index.html.erb b/app/views/templates_archived_submissions/index.html.erb index fe45b8bd..94e58ef1 100644 --- a/app/views/templates_archived_submissions/index.html.erb +++ b/app/views/templates_archived_submissions/index.html.erb @@ -16,7 +16,7 @@ <% if with_filters %> <%= render 'shared/search_input' %> <% end %> - <%= link_to new_template_submissions_export_path(@template), class: 'btn btn-ghost text-base', data: { turbo_frame: 'modal' } do %> + <%= link_to new_template_submissions_export_path(@template, archived: true), class: 'btn btn-ghost text-base', data: { turbo_frame: 'modal' } do %> <%= svg_icon('download', class: 'w-6 h-6 stroke-2') %> <%= t('export') %> <% end %>