diff --git a/app/views/submit_form/show.html.erb b/app/views/submit_form/show.html.erb index a55944eb..8385a30e 100644 --- a/app/views/submit_form/show.html.erb +++ b/app/views/submit_form/show.html.erb @@ -4,7 +4,6 @@ <% values = @submitter.submission.submitters.reduce({}) { |acc, sub| acc.merge(sub.values) } %> <% submitters_index = @submitter.submission.submitters.index_by(&:uuid) %> <% page_blob_struct = Struct.new(:url, :metadata, keyword_init: true) %> -<% policy_links_config = AccountConfigs.find_for_account(@submitter.account, AccountConfig::POLICY_LINKS_KEY) unless Docuseal.multitenant? %>
@@ -64,10 +63,10 @@ <% end %> <% end %> <%= render 'shared/attribution', link_path: '/start', account: @submitter.account, with_style: false %> - <% if policy_links_config %> + <% if @form_configs[:policy_links].present? %>
- <%= auto_link(MarkdownToHtml.call(policy_links_config.value)) %> + <%= auto_link(MarkdownToHtml.call(@form_configs[:policy_links])) %>
<% end %> diff --git a/lib/submitters/form_configs.rb b/lib/submitters/form_configs.rb index 2d1ec0ee..7b41afdf 100644 --- a/lib/submitters/form_configs.rb +++ b/lib/submitters/form_configs.rb @@ -10,7 +10,8 @@ module Submitters AccountConfig::ALLOW_TO_DECLINE_KEY, AccountConfig::REQUIRE_SIGNING_REASON_KEY, AccountConfig::REUSE_SIGNATURE_KEY, - AccountConfig::ALLOW_TYPED_SIGNATURE].freeze + AccountConfig::ALLOW_TYPED_SIGNATURE, + *(Docuseal.multitenant? ? [] : [AccountConfig::POLICY_LINKS_KEY])].freeze module_function @@ -26,6 +27,7 @@ module Submitters with_decline = find_safe_value(configs, AccountConfig::ALLOW_TO_DECLINE_KEY) != false with_signature_id = find_safe_value(configs, AccountConfig::WITH_SIGNATURE_ID) == true require_signing_reason = find_safe_value(configs, AccountConfig::REQUIRE_SIGNING_REASON_KEY) == true + policy_links = find_safe_value(configs, AccountConfig::POLICY_LINKS_KEY) attrs = { completed_button:, @@ -33,6 +35,7 @@ module Submitters with_confetti:, reuse_signature:, with_decline:, + policy_links:, completed_message:, require_signing_reason:, prefill_signature:,