From 24392d025862efad3d0adad82b68eeb843532eee Mon Sep 17 00:00:00 2001 From: Pete Matsyburka Date: Tue, 10 Sep 2024 13:09:46 +0300 Subject: [PATCH] remove redacted --- app/controllers/api/submissions_controller.rb | 2 +- app/controllers/api/submitters_controller.rb | 2 +- app/views/submit_form/show.html.erb | 1 - lib/submissions/create_from_submitters.rb | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/controllers/api/submissions_controller.rb b/app/controllers/api/submissions_controller.rb index 6fdd84d4..908a04b4 100644 --- a/app/controllers/api/submissions_controller.rb +++ b/app/controllers/api/submissions_controller.rb @@ -158,7 +158,7 @@ module Api :completed, :phone, :application_key, :external_id, :reply_to, :go_to_last, { metadata: {}, values: {}, readonly_fields: [], message: %i[subject body], fields: [:name, :uuid, :default_value, :value, :title, :description, - :readonly, :redacted, :validation_pattern, :invalid_message, + :readonly, :validation_pattern, :invalid_message, { default_value: [], value: [], preferences: {} }] }]] } ] diff --git a/app/controllers/api/submitters_controller.rb b/app/controllers/api/submitters_controller.rb index 1c5cc3a9..e9fc496b 100644 --- a/app/controllers/api/submitters_controller.rb +++ b/app/controllers/api/submitters_controller.rb @@ -91,7 +91,7 @@ module Api :completed, :phone, :application_key, :external_id, :go_to_last, { metadata: {}, values: {}, readonly_fields: [], message: %i[subject body], fields: [[:name, :uuid, :default_value, :value, - :readonly, :redacted, :validation_pattern, :invalid_message, + :readonly, :validation_pattern, :invalid_message, { default_value: [], value: [], preferences: {} }]] } ) end diff --git a/app/views/submit_form/show.html.erb b/app/views/submit_form/show.html.erb index d7a966ef..29c2651f 100644 --- a/app/views/submit_form/show.html.erb +++ b/app/views/submit_form/show.html.erb @@ -49,7 +49,6 @@ <% value = values[field['uuid']].presence || (field['default_value'].present? ? 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 %> - <% next if field['redacted'] && field['submitter_uuid'] != @submitter.uuid %> <% next if value == '{{date}}' && field['submitter_uuid'] != @submitter.uuid %> <% next if field['conditions'].present? && values[field['uuid']].blank? && field['submitter_uuid'] != @submitter.uuid %> <% next if field['conditions'].present? && field['submitter_uuid'] == @submitter.uuid %> diff --git a/lib/submissions/create_from_submitters.rb b/lib/submissions/create_from_submitters.rb index 1eae90e2..bb4d4f34 100644 --- a/lib/submissions/create_from_submitters.rb +++ b/lib/submissions/create_from_submitters.rb @@ -120,7 +120,6 @@ module Submissions field['title'] = attrs['title'] if attrs['title'].present? field['description'] = attrs['description'] if attrs['description'].present? field['readonly'] = attrs['readonly'] if attrs.key?('readonly') - field['redacted'] = attrs['redacted'] if attrs.key?('redacted') field['required'] = attrs['required'] if attrs.key?('required') if attrs.key?('default_value') && !field['type'].in?(%w[signature image initials file])