eager load files when collecting a submissions's files

2015-03-13 10:21:21 +01:00
parent 88730de8b6
commit 0b73180832
1 changed files with 2 additions and 2 deletions
--- 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