Merge remote-tracking branch 'origin/master'

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

@@ -462,9 +462,9 @@ class studentsList extends Component{
       checkBoxValues,
       checkAllValue
     }=this.state;
-    let currentOrderName = '学生学号'
+    let currentOrderName = '学生学号排序'
     if (order == ORDER_BY_GROUP) {
-      currentOrderName = '分班名称'
+      currentOrderName = '分班名称排序'
     } 
     const { coursesids } = this.props
     const course_group_id = this.props.match.params.course_group_id
@@ -625,12 +625,18 @@ class studentsList extends Component{
                     }
                   </ul>
                 </li>}
+                
                 <li className="drop_down">
-                  {currentOrderName}<i className="iconfont icon-xiajiantou font-12 ml2"></i>
+                  {currentOrderName}
-                  <ul className="drop_down_normal">
+                  { course_groups && !!course_groups.length && 
-                    <li onClick={() => this.onSortTypeChange(ORDER_BY_NUM)} >学生学号</li>
+                  <React.Fragment>
-                    <li onClick={() => this.onSortTypeChange(ORDER_BY_GROUP)} >分班名称</li>
+                  <i className="iconfont icon-xiajiantou font-12 ml2"></i>
+                  <ul className="drop_down_normal" style={{width: '124px'}}>
+                    <li onClick={() => this.onSortTypeChange(ORDER_BY_NUM)} >学生学号排序</li>
+                    <li onClick={() => this.onSortTypeChange(ORDER_BY_GROUP)} >分班名称排序</li>
                   </ul>
+                  </React.Fragment>
+                   }
                 </li>
               </div>
             </div>

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

@@ -174,7 +174,7 @@ function buildColumns(that) {
       },
     })
   }
-  if(isAdmin && hasGraduationModule) {
+  if(isAdminOrTeacher && hasGraduationModule) {
     columns.unshift({
     title: '',
     dataIndex: 'course_member_id',
@@ -594,7 +594,7 @@ class studentsList extends Component{
         `}</style>
         <div className="mt20 edu-back-white padding20 teacherList">
           <div className="clearfix stu_head" style={{paddingLeft: '15px'}}>
-            { isAdmin && hasGraduationModule && <Checkbox className="fl" onChange={this.onCheckAll} checked={checkAllValue} >已选 {checkBoxValues.length} 个</Checkbox> }
+            { isAdminOrTeacher && hasGraduationModule && <Checkbox className="fl" onChange={this.onCheckAll} checked={checkAllValue} >已选 {checkBoxValues.length} 个</Checkbox> }
             { <div className="studentList_operation_ul">
               { hasGraduationModule && isAdminOrTeacher && <li className="li_line drop_down">
                 加入答辩组<i className="iconfont icon-xiajiantou font-12 ml2"></i>