diff --git a/app/javascript/submission_form/area.vue b/app/javascript/submission_form/area.vue index 2c3fc5d4..b969f644 100644 --- a/app/javascript/submission_form/area.vue +++ b/app/javascript/submission_form/area.vue @@ -74,7 +74,7 @@ ID: {{ signature.uuid }}
- {{ t('reason') }}: {{ values[field.preferences?.reason_field_uuid] || t('digitally_signed_by') }} {{ submitter.name }} + {{ t('reason') }}: {{ values[field.preferences?.reason_field_uuid] || t('digitally_signed_by') }} {{ submitter.name }} diff --git a/app/views/submissions/_value.html.erb b/app/views/submissions/_value.html.erb index ad501cac..ab269352 100644 --- a/app/views/submissions/_value.html.erb +++ b/app/views/submissions/_value.html.erb @@ -12,7 +12,8 @@ ID: <%= attachment.uuid %>
- <%= t('reason') %>: <%= submitter.values[field.dig('preferences', 'reason_field_uuid')].presence || t('digitally_signed_by') %> <%= submitter.name %> + <% reason_value = submitter.values[field.dig('preferences', 'reason_field_uuid')].presence %> + <% if reason_value %><%= t('reason') %>: <% end %><%= reason_value || t('digitally_signed_by') %> <%= submitter.name %> <% if submitter.email %> <<%= submitter.email %>> <% end %> diff --git a/lib/submissions/generate_result_attachments.rb b/lib/submissions/generate_result_attachments.rb index 317fdc37..8842e9d9 100644 --- a/lib/submissions/generate_result_attachments.rb +++ b/lib/submissions/generate_result_attachments.rb @@ -236,7 +236,7 @@ module Submissions reason_string = I18n.with_locale(submitter.account.locale) do - "#{I18n.t('reason')}: #{reason_value || I18n.t('digitally_signed_by')} " \ + "#{reason_value ? "#{I18n.t('reason')}: " : ''}#{reason_value || I18n.t('digitally_signed_by')} " \ "#{submitter.name}#{submitter.email.present? ? " <#{submitter.email}>" : ''}\n" \ "#{I18n.l(attachment.created_at.in_time_zone(submitter.account.timezone), format: :long)} " \ "#{TimeUtils.timezone_abbr(submitter.account.timezone, attachment.created_at)}"