Merge from docusealco/wip

pull/440/head 1.9.2
Alex Turchyn 9 months ago committed by GitHub
commit 1b52a99662
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -7,7 +7,7 @@ on:
jobs: jobs:
build: build:
runs-on: ubuntu-24.04-arm runs-on: ubuntu-latest
steps: steps:
- name: Checkout code - name: Checkout code

@ -10,7 +10,7 @@ module Api
last_submitter = @submission.submitters.max_by(&:completed_at) last_submitter = @submission.submitters.max_by(&:completed_at)
if last_submitter.documents_attachments.blank? if last_submitter.documents_attachments.blank?
last_submitter.documents_attachments = Submissions::EnsureResultGenerated.call(submitter) last_submitter.documents_attachments = Submissions::EnsureResultGenerated.call(last_submitter)
end end
last_submitter.documents_attachments last_submitter.documents_attachments

@ -34,6 +34,8 @@ class StartFormController < ApplicationController
assign_submission_attributes(@submitter, @template) assign_submission_attributes(@submitter, @template)
Submissions::AssignDefinedSubmitters.call(@submitter.submission) Submissions::AssignDefinedSubmitters.call(@submitter.submission)
else
@submitter.assign_attributes(ip: request.remote_ip, ua: request.user_agent)
end end
if @submitter.save if @submitter.save
@ -65,8 +67,9 @@ class StartFormController < ApplicationController
.order(id: :desc) .order(id: :desc)
.where(declined_at: nil) .where(declined_at: nil)
.where(external_id: nil) .where(external_id: nil)
.where(ip: [nil, request.remote_ip])
.then { |rel| params[:resubmit].present? ? rel.where(completed_at: nil) : rel } .then { |rel| params[:resubmit].present? ? rel.where(completed_at: nil) : rel }
.find_or_initialize_by(**submitter_params.compact_blank) .find_or_initialize_by(email: submitter_params[:email], **submitter_params.compact_blank)
end end
def assign_submission_attributes(submitter, template) def assign_submission_attributes(submitter, template)

Loading…
Cancel
Save