Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/controllers/courses_controller.rb

@@ -298,7 +298,13 @@ class CoursesController < ApplicationController
     @applications = CourseMessage.unhandled_join_course_requests_by_course(@course).
         joins("join users on course_messages.course_message_id=users.id").
         where("LOWER(concat(users.lastname, users.firstname)) LIKE ?", "%#{search_str}%")
-    @teacher_list_size = @course.teachers.size
+    if @course.try(:id) != 1309 || current_user.admin? || current_user.try(:id) == 15582
+      teacher_list = @course.course_members.where("course_members.role in (1, 2, 3)")
+    else
+      teacher_list = @course.course_members.where("(course_members.role in (1, 3) or (course_members.user_id = #{current_user.id}
+                                          and course_members.role = 2))")
+    end
+    @teacher_list_size = teacher_list.size
     @applications_size = CourseMessage.unhandled_join_course_requests_by_course(@course).size
     @is_admin = @user_course_identity < Course::PROFESSOR
   end

public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js

@@ -56,16 +56,17 @@ class ShixunhomeWorkItem extends Component{
       startbtn:true,
     })
     let url= list+".json";
+    const w=window.open('about:blank');
     axios.get(url).then((response) => {
 
       if(response.status===200){
         if(response.data.status===-2){
-
           this.setState({
             startbtn:false,
             shixunsreplace:true,
             hidestartshixunsreplacevalue:response.data.message+".json"
           })
+          w.close()
         }else if(response.data.status===-1){
           console.log(response)
         }else if(response.data.status===-3){
@@ -74,11 +75,9 @@ class ShixunhomeWorkItem extends Component{
             startshixunCombattype:true,
             startbtn:false
           })
+          w.close()
         }else{
-
           if(response.data.status!=401&&response.data.status!=403){
-
-            const w=window.open('about:blank');
             w.location.href= "/tasks/"+response.data.game_identifier
           }
 
@@ -88,6 +87,8 @@ class ShixunhomeWorkItem extends Component{
       this.setState({
         startbtn:false
       })
+      w.close()
+
     });
 
   }