diff --git a/app/controllers/submit_form_controller.rb b/app/controllers/submit_form_controller.rb index 0cfebae3..621849eb 100644 --- a/app/controllers/submit_form_controller.rb +++ b/app/controllers/submit_form_controller.rb @@ -12,16 +12,20 @@ class SubmitFormController < ApplicationController def show @submitter = Submitter.find_by!(slug: params[:slug]) + submission = @submitter.submission + return redirect_to submit_form_completed_path(@submitter.slug) if @submitter.completed_at? - return render :archived if @submitter.submission.template.archived_at? || @submitter.submission.archived_at? - return render :expired if @submitter.submission.expired? + return render :archived if submission.template.archived_at? || submission.archived_at? + return render :expired if submission.expired? return render :declined if @submitter.declined_at? + return render :awaiting if submission.template.preferences['submitters_order'] == 'preserved' && + !Submitters.current_submitter_order?(@submitter) Submitters.preload_with_pages(@submitter) Submitters::MaybeUpdateDefaultValues.call(@submitter, current_user) - @attachments_index = ActiveStorage::Attachment.where(record: @submitter.submission.submitters, name: :attachments) + @attachments_index = ActiveStorage::Attachment.where(record: submission.submitters, name: :attachments) .preload(:blob).index_by(&:uuid) @form_configs = Submitters::FormConfigs.call(@submitter, CONFIG_KEYS) diff --git a/app/views/submit_form/awaiting.html.erb b/app/views/submit_form/awaiting.html.erb new file mode 100644 index 00000000..a1205824 --- /dev/null +++ b/app/views/submit_form/awaiting.html.erb @@ -0,0 +1,21 @@ +
<%= @submitter.submission.template.name %>
+<%= t('awaiting_completion_by_the_other_party') %>
+