Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

app/controllers/attachments_controller.rb

@@ -162,28 +162,30 @@ class AttachmentsController < ApplicationController
   def attachment_candown
     unless current_user.admin? || current_user.business?
       candown = true
-      if @file.container && current_user.logged?
+      unless params[:type] == 'history'
-        # 课堂资源、作业、毕设相关资源的权限判断
+        if @file.container && current_user.logged?
-        if @file.container.is_a?(Course)
+          # 课堂资源、作业、毕设相关资源的权限判断
-          course = @file.container
+          if @file.container.is_a?(Course)
-          candown = current_user.member_of_course?(course) || @file.is_public == 1
+            course = @file.container
-        elsif @file.container.is_a?(HomeworkCommon) || @file.container.is_a?(GraduationTask) || @file.container.is_a?(GraduationTopic)
+            candown = current_user.member_of_course?(course) || @file.is_public == 1
-          course = @file.container&.course
+          elsif @file.container.is_a?(HomeworkCommon) || @file.container.is_a?(GraduationTask) || @file.container.is_a?(GraduationTopic)
-          candown = current_user.member_of_course?(course)
+            course = @file.container&.course
-        elsif @file.container.is_a?(StudentWork)
+            candown = current_user.member_of_course?(course)
-          course = @file.container&.homework_common&.course
+          elsif @file.container.is_a?(StudentWork)
-          candown = current_user.member_of_course?(course)
+            course = @file.container&.homework_common&.course
-        elsif @file.container.is_a?(StudentWorksScore)
+            candown = current_user.member_of_course?(course)
-          course = @file.container&.student_work&.homework_common&.course
+          elsif @file.container.is_a?(StudentWorksScore)
-          candown = current_user.member_of_course?(course)
+            course = @file.container&.student_work&.homework_common&.course
-        elsif @file.container.is_a?(GraduationWork)
+            candown = current_user.member_of_course?(course)
-          course = @file.container&.graduation_task&.course
+          elsif @file.container.is_a?(GraduationWork)
-          candown = current_user.member_of_course?(course)
+            course = @file.container&.graduation_task&.course
-        elsif @file.container.is_a?(GraduationWorkScore)
+            candown = current_user.member_of_course?(course)
-          course = @file.container&.graduation_work&.graduation_task&.course
+          elsif @file.container.is_a?(GraduationWorkScore)
-          candown = current_user.member_of_course?(course)
+            course = @file.container&.graduation_work&.graduation_task&.course
+            candown = current_user.member_of_course?(course)
+          end
+          tip_exception(403, "您没有权限进入") if course.present? && !candown
         end
-        tip_exception(403, "您没有权限进入") if course.present? && !candown
       end
     end
   end

app/controllers/courses_controller.rb

@@ -1129,7 +1129,7 @@ class CoursesController < ApplicationController
 
   def validate_course_name
     tip_exception("课堂名称不能为空！") if params[:course][:name].blank?
-    if params[:subject_id].blank? || (@course && @course.subject.blank?)
+    if params[:subject_id].blank? && @course.blank? || (@course && @course.subject.blank?)
       tip_exception("课程名称不能为空！") if params[:course_list_name].blank?
       tip_exception("课堂名称应以课程名称开头命名") unless params[:course][:name].index(params[:course_list_name]) &&
         params[:course][:name].index(params[:course_list_name]) == 0

app/models/homework_common.rb

@@ -36,7 +36,7 @@ class HomeworkCommon < ApplicationRecord
 
   validates :name, length: { maximum: 60 }
   validates :description, length: { maximum: 15000 }
-  validates :reference_answer, length: { maximum: 5000 }
+  validates :reference_answer, length: { maximum: 15000 }
 
   # after_update :update_activity
   before_destroy :update_homework_bank_quotes

app/views/attachment_histories/_attachment_history.json.jbuilder

@@ -8,3 +8,4 @@ json.downloads_count attachment.downloads_count
 json.created_on attachment.created_on
 json.url attachment_path(attachment, type: 'history').gsub("/api","")
 json.is_pdf attachment.is_history_pdf?
+json.attachment_id attachment.attachment_id