Merge branch 'develop' into dev_aliyun

app/models/attachment.rb

@@ -21,7 +21,7 @@ class Attachment < ApplicationRecord
   scope :contains_only_project,         -> { where(container_type: 'Project') }
   scope :contains_course_and_project,   -> { contains_only_course.or(contains_only_project) }
   scope :mine,                          -> (author_id) { where(author_id: author_id) }
-  scope :simple_columns,                -> { select(:id, :filename, :filesize, :created_on, :cloud_url, :author_id, :content_type) }
+  scope :simple_columns,                -> { select(:id, :filename, :filesize, :created_on, :cloud_url, :author_id, :content_type, :container_type, :container_id) }
   scope :search_by_container,           -> (ids) {where(container_id: ids)}
   scope :unified_setting, -> {where("unified_setting = ? ", 1)}