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

app/controllers/student_works_controller.rb

@@ -321,11 +321,12 @@ class StudentWorksController < ApplicationController
 
     ActiveRecord::Base.transaction do
       begin
-        revise_attachment = @work.attachments.where(attachtype: 7).reorder("created_on desc").last
-        if revise_attachment.present? && @work.student_works_scores.where("created_at > '#{revise_attachment.created_on}'
-                                                                         and score is not null").count == 0
-          revise_attachment.destroy
-        end
+        # 补交作业附件不覆盖之前上传的附件
+        # revise_attachment = @work.attachments.where(attachtype: 7).reorder("created_on desc").last
+        # if revise_attachment.present? && @work.student_works_scores.where("created_at > '#{revise_attachment.created_on}'
+        #                                                                  and score is not null").count == 0
+        #   revise_attachment.destroy
+        # end
         Attachment.associate_container(params[:attachment_ids], @work.id, @work.class, 7)
         revise_attachment = Attachment.where(attachtype: 7, container_id: @work.id, container_type: "StudentWork").last
         revise_attachment.update_attributes(description: params[:description]) if revise_attachment.present?

app/jobs/apply_teacher_role_join_course_notify_job.rb

@@ -8,7 +8,7 @@ class ApplyTeacherRoleJoinCourseNotifyJob < ApplicationJob
     return if user.blank? || course.blank?
 
     attrs = %i[user_id trigger_user_id container_id container_type belong_container_id
-              belong_container_type tiding_type extra created_at updated_at]
+              belong_container_type tiding_type status extra created_at updated_at]
 
     same_attrs = {
       trigger_user_id: user.id, container_id: course.id, container_type: 'JoinCourse', status: 0,

app/models/course_message.rb

@@ -32,6 +32,6 @@ class CourseMessage < ApplicationRecord
       belong_container: course, extra: content.to_i == 2 ? '9' : '7', tiding_type: 'System', status: deal_status
     )
     # 将申请消息置为已处理
-    Tiding.where(trigger_user_id: user_id, container_id: course_id, container_type: 'JoinCourse', status: 0).update_all(status: 1)
+    Tiding.where(trigger_user_id: course_message_id, container_id: course_id, container_type: 'JoinCourse', status: 0).update_all(status: 1)
   end
 end

app/models/student_graduation_topic.rb

@@ -21,7 +21,7 @@ class StudentGraduationTopic < ApplicationRecord
 
   def send_tiding
     self.tidings << Tiding.new(:user_id => self.graduation_topic.tea_id, :trigger_user_id => self.user_id, :parent_container_id => self.graduation_topic_id, :parent_container_type => "GraduationTopic",
-                               :belong_container_id => self.graduation_topic.course_id, :belong_container_type => "Course", :viewed => 0, :status => 0, :tiding_type => "GraduationTopic")
+                               :belong_container_id => self.graduation_topic.course_id, :belong_container_type => "Course", :viewed => 0, :status => 0, :tiding_type => "Apply")
   end
 
   # 学生名称

public/react/src/modules/courses/busyWork/CommonWorkAppraise.js

@@ -248,7 +248,9 @@ class CommonWorkAppraise extends Component{
 
           </div> }
 
-          <CommonWorkAppraiseReviseAttachments {...this.state}></CommonWorkAppraiseReviseAttachments>
+          <CommonWorkAppraiseReviseAttachments {...this.state}
+            onAttachmentRemove={this.onAttachmentRemove}
+          ></CommonWorkAppraiseReviseAttachments>
 
             {is_evaluation != true && project_info && project_info.name && <div className={"stud-class-set bor-top-greyE edu-back-white padding20-30"}>
               <div className={"color-grey-6 mb10"}>

public/react/src/modules/courses/busyWork/CommonWorkAppraiseReviseAttachments.js

@@ -33,7 +33,7 @@ function CommonWorkAppraiseReviseAttachments(props) {
                     {item.title}
                 </a>
                 <span className="color656565 mt2 color-grey-6 font-12 mr8">{item.filesize}</span>
-                {item.delete===true?<i className="font-14 iconfont  icon-guanbi " style={{display: 'none'}} id={item.id} aria-hidden="true" onClick={()=>this.onAttachmentRemove(item.id)}></i>:""}
+                {item.delete===true?<i className="font-14 iconfont  icon-guanbi " style={{display: 'none'}} id={item.id} aria-hidden="true" onClick={()=>this.props.onAttachmentRemove(item.id)}></i>:""}
                 </div>
             )
             })}

public/react/src/modules/page/component/monaco/TPIMonaco.js

@@ -290,6 +290,7 @@ class TPIMonaco extends Component {
 
                 // theme: "vs-dark",
                 theme: "myCoolTheme",
+                insertSpaces: false,
                 fontSize: this.state.cmFontSize
                 
             });