diff --git a/app/views/submission_events/index.html.erb b/app/views/submission_events/index.html.erb index 5c454288..1ce6c8c0 100644 --- a/app/views/submission_events/index.html.erb +++ b/app/views/submission_events/index.html.erb @@ -20,7 +20,7 @@ <% end %>

- <% submitter_versions_index = @submission.submitters.each_with_object({}) { |s, h| h[s.id] = s.submitter_versions.to_a.sort_by(&:created_at) } %> + <% submitter_versions_index = @submission.submitters.preload(:submitter_versions).each_with_object({}) { |s, h| h[s.id] = s.submitter_versions.to_a.sort_by(&:created_at) } %> <% @submission.submission_events.order(:event_timestamp).each do |event| %> <% submitter = @submission.submitters.find { |e| e.id == event.submitter_id } %> <% bg_class = event_colors[submitters_uuids.index(submitter.uuid) % event_colors.length] %> diff --git a/lib/submissions/generate_audit_trail.rb b/lib/submissions/generate_audit_trail.rb index 0c7660db..794d0dc7 100644 --- a/lib/submissions/generate_audit_trail.rb +++ b/lib/submissions/generate_audit_trail.rb @@ -438,7 +438,7 @@ module Submissions composer.text(I18n.t('event_log'), font_size: 12, padding: [10, 0, 20, 0]) - submitter_versions_index = submission.submitters.each_with_object({}) do |s, h| + submitter_versions_index = submission.submitters.preload(:submitter_versions).each_with_object({}) do |s, h| h[s.id] = s.submitter_versions.to_a.sort_by(&:created_at) end