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

app/models/mirror_repository.rb

@@ -5,7 +5,7 @@ class MirrorRepository < ApplicationRecord
 
 
 
-  scope :published_mirror, -> { where(status: 1) }
+  scope :published_mirror, -> { where(status: [1,2,3,5]) }
   scope :published_main_mirror, -> { published_mirror.where(main_type: 1) }
   scope :published_small_mirror, -> { published_mirror.where(main_type: 0) }
 

public/react/src/modules/courses/Index.js

@@ -661,6 +661,11 @@ class CoursesIndex extends Component{
                            (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
+                <Route path="/courses/:coursesId/course_groups"
+                       render={
+                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
+                       }
+                ></Route>
                 
                 {/* 普通作业 */}
                 <Route path="/courses/:coursesId/common_homeworks/:category_id" exact 

public/react/src/modules/courses/ListPageIndex.js

@@ -232,6 +232,11 @@ class ListPageIndex extends Component{
                                                         (props) => (<StudentsList {...this.props} {...props} {...this.state} />)
                                                     }
                                                 ></Route>
+                                                <Route path="/courses/:coursesId/course_groups"
+                                                    render={
+                                                        (props) => (<StudentsList {...this.props} {...props} {...this.state} />)
+                                                    }
+                                                ></Route>
 
                                                 <Route path="/courses/:coursesId/exercises/:Id"
                                                     render={

public/react/src/modules/courses/members/studentsList.js

@@ -16,7 +16,9 @@ import DownloadMessageysl from "../../modals/DownloadMessageysl";
 import CreateGroupByImportModal from './modal/CreateGroupByImportModal'
 
 const Search =Input.Search;
-
+const TYPE_STUDENTS = 1
+const TYPE_COURSE_GOURP_PARENT = 2
+const TYPE_COURSE_GOURP_CHILD = 3
 const buildColumns = (that,isParent) => {
   const { course_groups , sortedInfo } = that.state
   let showSorter = isParent==true
@@ -581,6 +583,16 @@ class studentsList extends Component{
     // console.log(paramsString);
     // console.log(checkBoxValues);
     // console.log(searchValue);
+    let pageType = TYPE_STUDENTS
+    if (this.props.match.path.endsWith('students')) {
+
+    } else if (course_group_id) {
+      pageType = TYPE_COURSE_GOURP_PARENT
+    } else {
+      pageType = TYPE_COURSE_GOURP_CHILD
+    }
+
+
     return(
       <React.Fragment >
         <DownloadMessageysl
@@ -590,7 +602,7 @@ class studentsList extends Component{
           modalsType={this.state.DownloadType}
         />
         <Titlesearchsection
-          title={isParent ? "学生列表" : 
+          title={isParent ? (pageType == TYPE_STUDENTS ? "全部学生" : "学生列表"): 
             <React.Fragment>
               <span>{course_group_name || '未分班'}</span>
               {isAdmin && invite_code && <React.Fragment>
@@ -617,15 +629,21 @@ class studentsList extends Component{
           searchPlaceholder={ '请输入姓名、学号进行搜索' }
           firstRowRight={
             <React.Fragment> 
-              { isSuperAdmin && <React.Fragment>
+              { 
+                // pageType !== TYPE_STUDENTS && 
+                isSuperAdmin && <React.Fragment>
                   <CreateGroupByImportModal ref="createGroupByImportModal" {...this.props}
                     createGroupImportSuccess={this.createGroupImportSuccess}
                   ></CreateGroupByImportModal>
                   <WordsBtn style="blue" className="mr30" onClick={()=> this.refs['createGroupByImportModal'].setVisible(true)}>导入创建分班</WordsBtn>
                 </React.Fragment> }
-              { !isCourseEnd && isAdmin && isParent && <WordsBtn style="blue" className="mr30" onClick={()=>this.addDir()}>添加分班</WordsBtn> }
+              { 
-              { isAdmin && !isParent && course_group_id != 0 && <WordsBtn style="blue" className="mr30" onClick={()=>this.deleteDir()}>删除分班</WordsBtn> }
+                // pageType !== TYPE_STUDENTS && 
-              { isAdmin && !isParent && course_group_id != 0 && <WordsBtn style="blue" className="mr30" onClick={()=>this.renameDir()}>分班重命名</WordsBtn> }
+                  !isCourseEnd && isAdmin && isParent && <WordsBtn style="blue" className="mr30" onClick={()=>this.addDir()}>添加分班</WordsBtn> }
+              { 
+                  isAdmin && !isParent && course_group_id != 0 && <WordsBtn style="blue" className="mr30" onClick={()=>this.deleteDir()}>删除分班</WordsBtn> }
+              { 
+                  isAdmin && !isParent && course_group_id != 0 && <WordsBtn style="blue" className="mr30" onClick={()=>this.renameDir()}>分班重命名</WordsBtn> }
               <style>{`
                 .drop_down_menu li a {
                     padding: 0px;

public/react/src/modules/courses/members/teacherList.js

@@ -98,7 +98,7 @@ function buildColumns(that) {
       return (
         <ConditionToolTip title={`暂未有分班信息，不能操作`} condition={noGroups}>
         <span className="drop_down" style={{color: '#29BD8B', display: 'inline-block'}}>
-        { arg_course_groups.length == 0 ? '不限' : arg_course_groups.map(item => item.name).join(', ') }
+        { arg_course_groups.length == 0 ? '全部分班' : arg_course_groups.map(item => item.name).join(', ') }
         { isAdmin &&
           <React.Fragment>
             <i className="iconfont icon-xiajiantou font-12 ml2"></i>
@@ -645,6 +645,9 @@ class studentsList extends Component{
             <React.Fragment>
               {/* { isAdmin && <WordsBtn style="blue" className="mr30" onClick={()=>this.addTeacher()}>添加教师</WordsBtn> }
               { isAdmin && <WordsBtn style="blue" className="mr30" onClick={()=>this.addStudent()}>添加学生</WordsBtn> } */}
+              
+              { isAdmin && <WordsBtn style="blue" className="fr" onClick={()=>this.showChangeAdminModal()}>更换管理员</WordsBtn>}
+            
             </React.Fragment>
           }
           secondRowLeft={