From 0e33e23d1f6abf234daf293c629c69590643789f Mon Sep 17 00:00:00 2001 From: Pete Matsyburka Date: Fri, 27 Jun 2025 12:49:25 +0300 Subject: [PATCH] fix prefill condition --- lib/submitters/submit_values.rb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/submitters/submit_values.rb b/lib/submitters/submit_values.rb index 8775f26e..eb9e26a4 100644 --- a/lib/submitters/submit_values.rb +++ b/lib/submitters/submit_values.rb @@ -219,8 +219,7 @@ module Submitters submitters_values = nil has_other_submitters = submission.template_submitters.size > 1 - has_document_conditions = - (submission.template_schema || submission.template.schema).any? { |e| e['conditions'].present? } + has_document_conditions = submission_has_document_conditions?(submission) attachments_index = if has_document_conditions @@ -234,7 +233,7 @@ module Submitters if has_document_conditions && !check_field_areas_attachments(field, attachments_index) submitter.values.delete(field['uuid']) - required_field_uuids_acc.delete(field['uuid']) + required_field_uuids_acc&.delete(field['uuid']) end if has_other_submitters && !submitters_values && @@ -244,13 +243,17 @@ module Submitters unless check_field_conditions(submitters_values || submitter.values, field, submission.fields_uuid_index) submitter.values.delete(field['uuid']) - required_field_uuids_acc.delete(field['uuid']) + required_field_uuids_acc&.delete(field['uuid']) end end submitter.values end + def submission_has_document_conditions?(submission) + (submission.template_schema || submission.template.schema).any? { |e| e['conditions'].present? } + end + def required_editable_field?(field) return false if NONEDITABLE_FIELD_TYPES.include?(field['type'])