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

app/controllers/exercises_controller.rb

@@ -694,6 +694,7 @@ class ExercisesController < ApplicationController
 
   #首页批量或单独 立即发布,应是跳出弹窗，设置开始时间和截止时间。
   def publish
+    group_ids = params[:group_ids]&.reject(&:blank?)
     if params[:detail].blank?
       tip_exception("缺少截止时间参数") if params[:end_time].blank?
       tip_exception("截止时间不能早于当前时间") if params[:end_time] <= strf_time(Time.now)
@@ -701,7 +702,6 @@ class ExercisesController < ApplicationController
         @course.end_date.present? && params[:end_time] > strf_time(@course.end_date.end_of_day)
     else
       group_end_times = params[:group_end_times].reject(&:blank?).map{|time| time.to_time}
-      group_ids = params[:group_ids].reject(&:blank?)
       tip_exception("缺少截止时间参数") if group_end_times.blank?
       tip_exception("截止时间和分班参数的个数不一致") if group_end_times.length != group_ids.length
       group_end_times.each do |time|

app/controllers/homework_commons_controller.rb

@@ -1044,6 +1044,7 @@ class HomeworkCommonsController < ApplicationController
 
   def publish_homework
     tip_exception("请至少选择一个分班") if params[:group_ids].blank? && @course.course_groups.size != 0
+    group_ids = params[:group_ids]&.reject(&:blank?)
     if params[:detail].blank?
       tip_exception("缺少截止时间参数") if params[:end_time].blank?
       tip_exception("截止时间不能早于当前时间") if params[:end_time] <= strf_time(Time.now)
@@ -1051,7 +1052,6 @@ class HomeworkCommonsController < ApplicationController
         @course.end_date.present? && params[:end_time] > strf_time(@course.end_date.end_of_day)
     else
       group_end_times = params[:group_end_times].reject(&:blank?).map{|time| time.to_time}
-      group_ids = params[:group_ids].reject(&:blank?)
       tip_exception("缺少截止时间参数") if group_end_times.blank?
       tip_exception("截止时间和分班参数的个数不一致") if group_end_times.length != group_ids.length
       group_end_times.each do |time|

app/controllers/polls_controller.rb

@@ -254,6 +254,7 @@ class PollsController < ApplicationController
 
   #首页批量或单独 立即发布,应是跳出弹窗，设置开始时间和截止时间。
   def publish
+    group_ids = params[:group_ids]&.reject(&:blank?)
     if params[:detail].blank?
       tip_exception("缺少截止时间参数") if params[:end_time].blank?
       tip_exception("截止时间不能早于当前时间") if params[:end_time] <= strf_time(Time.now)
@@ -261,7 +262,6 @@ class PollsController < ApplicationController
         @course.end_date.present? && params[:end_time] > strf_time(@course.end_date.end_of_day)
     else
       group_end_times = params[:group_end_times].reject(&:blank?).map{|time| time.to_time}
-      group_ids = params[:group_ids].reject(&:blank?)
       tip_exception("缺少截止时间参数") if group_end_times.blank?
       tip_exception("截止时间和分班参数的个数不一致") if group_end_times.length != group_ids.length
       group_end_times.each do |time|

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

@@ -547,6 +547,19 @@ class studentsList extends Component{
   addDir = () => {
     trigger('groupAdd', this.props.coursesids)
   }
+  addToDir = async () => {
+    const courseId = this.props.match.params.coursesId    
+    const url = `/courses/${courseId}/join_course_group.json`
+    const course_group_id = this.props.match.params.course_group_id
+
+    const response = await axios.post(url, {
+      course_group_id
+    })
+    if (response && response.data.status == 0) {
+      this.props.showNotification('加入成功')
+      this.fetchAll()
+    }
+  }
   renameDir = () => {
     const course_group_id = this.props.match.params.course_group_id
     trigger('groupRename', { id: parseInt(course_group_id), name: this.state.course_group_name})
@@ -593,6 +606,7 @@ class studentsList extends Component{
 
   render(){
     const isAdmin = this.props.isAdmin()
+    const isStudent = this.props.isStudent()
     const isSuperAdmin = this.props.isSuperAdmin()
     const isCourseEnd = this.props.isCourseEnd()
     let {
@@ -704,6 +718,8 @@ class studentsList extends Component{
               { 
                 // pageType !== TYPE_STUDENTS && 
                   !isCourseEnd && isAdmin && isParent && <WordsBtn style="blue" className="mr30" onClick={()=>this.addDir()}>添加分班</WordsBtn> }
+              { 
+                  isStudent && !isParent && course_group_id != 0 && <WordsBtn style="blue" className="mr30" onClick={()=>this.addToDir()}>加入分班</WordsBtn> }
               { 
                   isAdmin && !isParent && course_group_id != 0 && <WordsBtn style="blue" className="mr30" onClick={()=>this.deleteDir()}>删除分班</WordsBtn> }
               { 

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

@@ -649,6 +649,7 @@ class studentsList extends Component{
       combineArray = this.state.application_list
     }
     const isAdminOrTeacher = this.props.isAdminOrTeacher()
+    const isAdminOrCreator = this.props.isAdminOrCreator()
     const isSuperAdmin = this.props.isSuperAdmin()
     const hasGraduationModule = this.hasGraduationModule()
     const coursesId = this.props.match.params.coursesId
@@ -685,7 +686,7 @@ class studentsList extends Component{
               {/* { 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>}
+              { isAdminOrCreator && <WordsBtn style="blue" className="fr" onClick={()=>this.showChangeAdminModal()}>更换管理员</WordsBtn>}
             
             </React.Fragment>
           }