Merge branch 'develop' into dev_aliyun

5 years ago · 5153d8d50b
parent 585e9ecd24 b9b3a303a7
commit 5153d8d50b
1 changed files with 1 additions and 1 deletions
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@ -35,7 +35,7 @@ class Attachment < ApplicationRecord

  def title
    title = filename
-    if container.is_a?(StudentWork) && author_id != User.current.id
+    if container && container.is_a?(StudentWork) && author_id != User.current.id
      course = container&.homework_common&.course
      unless User.current.teacher_of_course?(course)
        title = "#{Time.now.strftime('%Y%m%d%H%M%S')}_#{DCODES.sample(8).join}" + File.extname(filename)