From 984df15949e916d033d4d7fb9bf1689de04c168b Mon Sep 17 00:00:00 2001 From: Pete Matsyburka Date: Tue, 20 Feb 2024 21:30:00 +0200 Subject: [PATCH] pass account local var in attribution --- app/views/start_form/completed.html.erb | 4 ++-- app/views/start_form/show.html.erb | 2 +- app/views/submissions_preview/completed.html.erb | 2 +- app/views/submit_form/archived.html.erb | 4 ++-- app/views/submit_form/completed.html.erb | 4 ++-- app/views/submit_form/show.html.erb | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/views/start_form/completed.html.erb b/app/views/start_form/completed.html.erb index 71750f6f..56be4843 100644 --- a/app/views/start_form/completed.html.erb +++ b/app/views/start_form/completed.html.erb @@ -19,7 +19,7 @@
<%= t('form_has_been_submitted_already') %>
- <% if Accounts.can_send_emails?(@submitter.submission.template.account) %> + <% if Accounts.can_send_emails?(@submitter.account) %>
<%= button_to button_title(title: t('send_copy_to_email'), disabled_with: t('sending'), icon: svg_icon('mail_forward', class: 'w-6 h-6')), send_submission_email_index_path, params: { submitter_slug: @submitter.slug }, form: { onsubmit: 'event.submitter.disabled = true' }, class: 'base-button w-full' %>
@@ -31,4 +31,4 @@ <% end %> -<%= render 'shared/attribution', link_path: '/start' %> +<%= render 'shared/attribution', link_path: '/start', account: @submitter.account %> diff --git a/app/views/start_form/show.html.erb b/app/views/start_form/show.html.erb index cb46e97f..6b3a3a87 100644 --- a/app/views/start_form/show.html.erb +++ b/app/views/start_form/show.html.erb @@ -37,4 +37,4 @@ <% end %> -<%= render 'shared/attribution', link_path: '/start' %> +<%= render 'shared/attribution', link_path: '/start', account: @template.account %> diff --git a/app/views/submissions_preview/completed.html.erb b/app/views/submissions_preview/completed.html.erb index 0379e8dc..0395982d 100644 --- a/app/views/submissions_preview/completed.html.erb +++ b/app/views/submissions_preview/completed.html.erb @@ -27,4 +27,4 @@ <% end %> -<%= render 'shared/attribution', link_path: '/start' %> +<%= render 'shared/attribution', link_path: '/start', account: @submission.account %> diff --git a/app/views/submit_form/archived.html.erb b/app/views/submit_form/archived.html.erb index 94dfb447..bacbfc1d 100644 --- a/app/views/submit_form/archived.html.erb +++ b/app/views/submit_form/archived.html.erb @@ -11,11 +11,11 @@

<%= @submitter.submission.template.name %>

-

<%= t('form_has_been_deleted_by_html', name: @submitter.submission.template.account.name) %>

+

<%= t('form_has_been_deleted_by_html', name: @submitter.account.name) %>

-<%= render 'shared/attribution', link_path: '/start' %> +<%= render 'shared/attribution', link_path: '/start', account: @submitter.account %> diff --git a/app/views/submit_form/completed.html.erb b/app/views/submit_form/completed.html.erb index 4a103102..2373f5f9 100644 --- a/app/views/submit_form/completed.html.erb +++ b/app/views/submit_form/completed.html.erb @@ -17,7 +17,7 @@
- <% if Accounts.can_send_emails?(@submitter.submission.template.account) && @submitter.email.present? %> + <% if Accounts.can_send_emails?(@submitter.account) && @submitter.email.present? %> <%= button_to button_title(title: t('send_copy_to_email'), disabled_with: t('sending'), icon: svg_icon('mail_forward', class: 'w-6 h-6')), send_submission_email_index_path, params: { submitter_slug: @submitter.slug }, form: { onsubmit: 'event.submitter.disabled = true' }, class: 'white-button w-full' %> <% if @submitter.submission.template.submitters.size != 1 %>
<%= t('or') %>
@@ -46,4 +46,4 @@ <% end %>
-<%= render 'shared/attribution', link_path: '/start' %> +<%= render 'shared/attribution', link_path: '/start', account: @submitter.account %> diff --git a/app/views/submit_form/show.html.erb b/app/views/submit_form/show.html.erb index 41e892d9..e1a2dd44 100644 --- a/app/views/submit_form/show.html.erb +++ b/app/views/submit_form/show.html.erb @@ -24,13 +24,13 @@ <% value = values[field['uuid']].presence || (field['readonly'] ? Submitters::SubmitValues.template_default_value_for_submitter(field['default_value'], @submitter.submission.submitters.find { |e| e.uuid == field['submitter_uuid'] }, with_time: false) : nil) %> <% next if value.blank? %> <% next if !field['readonly'] && field['submitter_uuid'] == @submitter.uuid %> - <%= render 'submissions/value', area:, field:, attachments_index:, value:, locale: @submitter.submission.template.account.locale %> + <%= render 'submissions/value', area:, field:, attachments_index:, value:, locale: @submitter.account.locale %> <% end %> <% end %> <% end %> - <%= render 'shared/attribution', link_path: '/start' %> + <%= render 'shared/attribution', link_path: '/start', account: @submitter.account %>