Merge branch 'develop' into dev_aliyun

5 years ago · 676ad10e85
parent 1a7c7ea0d9 727776cec7
commit 676ad10e85
1 changed files with 1 additions and 1 deletions
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@ -140,7 +140,7 @@ class FilesController < ApplicationController
  def public_with_course_and_project
    @attachments = Attachment.publiced.simple_columns
                       .contains_course_and_project
-                       .includes(:author => :user_extension)
+                       .includes(:container, author: :user_extension)
                       .by_filename_or_user_name(params[:search])
                       .ordered(sort: 0, sort_type: 'created_on')