From 0b73180832be89b6a0152d1ff32f3068e75b5245 Mon Sep 17 00:00:00 2001 From: Hauke Klement Date: Fri, 13 Mar 2015 10:21:21 +0100 Subject: [PATCH] eager load files when collecting a submissions's files --- app/models/submission.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/submission.rb b/app/models/submission.rb index 5a492d34..c347c503 100644 --- a/app/models/submission.rb +++ b/app/models/submission.rb @@ -21,8 +21,8 @@ class Submission < ActiveRecord::Base private :build_files_hash def collect_files - ancestors = build_files_hash(exercise.files, :id) - descendants = build_files_hash(files, :file_id) + ancestors = build_files_hash(exercise.files.includes(:file_type), :id) + descendants = build_files_hash(files.includes(:file_type), :file_id) ancestors.merge(descendants).values end