Skip to content

Commit 065dcf6

Browse files
committed
fix include combined_document_url
1 parent a66b16c commit 065dcf6

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

app/controllers/api/submissions_controller.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@ def index
1717
submissions = Submissions.search(current_user, @submissions, params[:q])
1818
submissions = filter_submissions(submissions, params)
1919

20-
with_fields = params[:include].to_s.include?('fields')
20+
with_fields = params[:include].to_s.include?('fields') || params[:include].to_s.include?('combined_document_url')
2121

2222
submissions = paginate(
23-
submissions.select(with_fields ? SUBMISSION_COLUMNS + %i[template_fields] : SUBMISSION_COLUMNS)
23+
submissions.select(with_fields ? nil : SUBMISSION_COLUMNS)
2424
.preload(:created_by_user, :submitters, combined_document_attachment: :blob,
2525
audit_trail_attachment: :blob)
2626
)
2727

2828
ActiveRecord::Associations::Preloader.new(
2929
records: submissions,
3030
associations: :template,
31-
scope: Template.select(with_fields ? TEMPLATE_COLUMNS + %i[fields] : TEMPLATE_COLUMNS)
31+
scope: with_fields ? nil : Template.select(TEMPLATE_COLUMNS)
3232
).call
3333

3434
ActiveRecord::Associations::Preloader.new(records: submissions.filter_map(&:template),

0 commit comments

Comments
 (0)