From 5c69b965c05673601e021d9d2aa10ffab4e711d3 Mon Sep 17 00:00:00 2001 From: Pete Matsyburka Date: Thu, 25 Jan 2024 23:41:44 +0200 Subject: [PATCH] fix submission default values with 2+ submitters --- app/controllers/api/submitters_controller.rb | 2 +- lib/submissions/create_from_submitters.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/api/submitters_controller.rb b/app/controllers/api/submitters_controller.rb index df8857e9..dbefd551 100644 --- a/app/controllers/api/submitters_controller.rb +++ b/app/controllers/api/submitters_controller.rb @@ -44,7 +44,7 @@ module Api Submissions::CreateFromSubmitters.maybe_set_template_fields(@submitter.submission, [normalized_params], - submitter_uuid: @submitter.uuid) + default_submitter_uuid: @submitter.uuid) assign_submitter_attrs(@submitter, normalized_params) diff --git a/lib/submissions/create_from_submitters.rb b/lib/submissions/create_from_submitters.rb index e623b4b5..13d4f851 100644 --- a/lib/submissions/create_from_submitters.rb +++ b/lib/submissions/create_from_submitters.rb @@ -39,11 +39,11 @@ module Submissions end end - def maybe_set_template_fields(submission, submitters_attrs, submitter_uuid: nil) + def maybe_set_template_fields(submission, submitters_attrs, default_submitter_uuid: nil) template_fields = (submission.template_fields || submission.template.fields).deep_dup submitters_attrs.each_with_index do |submitter_attrs, index| - submitter_uuid ||= find_submitter_uuid(submission.template, submitter_attrs, index) + submitter_uuid = default_submitter_uuid || find_submitter_uuid(submission.template, submitter_attrs, index) process_readonly_fields_param(submitter_attrs[:readonly_fields], template_fields, submitter_uuid) process_field_values_param(submitter_attrs[:values], template_fields, submitter_uuid)