adjust default recipients
This commit is contained in:
committed by
Oleksandr Turchyn
parent
50b0f7e5ed
commit
4ab1065773
@@ -11,7 +11,8 @@ class StartFormController < ApplicationController
|
|||||||
|
|
||||||
def show
|
def show
|
||||||
@submitter = @template.submissions.new(account_id: @template.account_id)
|
@submitter = @template.submissions.new(account_id: @template.account_id)
|
||||||
.submitters.new(uuid: filter_undefined_submitters(@template).first['uuid'])
|
.submitters.new(uuid: (filter_undefined_submitters(@template).first ||
|
||||||
|
@template.submitters.first)['uuid'])
|
||||||
end
|
end
|
||||||
|
|
||||||
def update
|
def update
|
||||||
@@ -68,7 +69,7 @@ class StartFormController < ApplicationController
|
|||||||
(Submitter.where(submission: template.submissions).find_by(slug: params[:resubmit]) if params[:resubmit].present?)
|
(Submitter.where(submission: template.submissions).find_by(slug: params[:resubmit]) if params[:resubmit].present?)
|
||||||
|
|
||||||
submitter.assign_attributes(
|
submitter.assign_attributes(
|
||||||
uuid: filter_undefined_submitters(template).first['uuid'],
|
uuid: (filter_undefined_submitters(template).first || @template.submitters.first)['uuid'],
|
||||||
ip: request.remote_ip,
|
ip: request.remote_ip,
|
||||||
ua: request.user_agent,
|
ua: request.user_agent,
|
||||||
values: resubmit_submitter&.preferences&.fetch('default_values', nil) || {},
|
values: resubmit_submitter&.preferences&.fetch('default_values', nil) || {},
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ module Submissions
|
|||||||
def assign_defined_submitters(submission)
|
def assign_defined_submitters(submission)
|
||||||
submission.template.submitters.to_a.select do |item|
|
submission.template.submitters.to_a.select do |item|
|
||||||
next if item['email'].blank? && item['is_requester'].blank?
|
next if item['email'].blank? && item['is_requester'].blank?
|
||||||
|
next if submission.submitters.any? { |e| e.uuid == item['uuid'] }
|
||||||
|
|
||||||
submission.submitters.new(
|
submission.submitters.new(
|
||||||
account_id: submission.account_id,
|
account_id: submission.account_id,
|
||||||
@@ -36,6 +37,7 @@ module Submissions
|
|||||||
def assign_linked_submitters(submission)
|
def assign_linked_submitters(submission)
|
||||||
submission.template.submitters.to_a.select do |item|
|
submission.template.submitters.to_a.select do |item|
|
||||||
next if item['linked_to_uuid'].blank?
|
next if item['linked_to_uuid'].blank?
|
||||||
|
next if submission.submitters.any? { |e| e.uuid == item['uuid'] }
|
||||||
|
|
||||||
email = submission.submitters.find { |s| s.uuid == item['linked_to_uuid'] }&.email
|
email = submission.submitters.find { |s| s.uuid == item['linked_to_uuid'] }&.email
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user