diff --git a/app/controllers/subjects_controller.rb b/app/controllers/subjects_controller.rb index 864c2c426..9b28d9a10 100644 --- a/app/controllers/subjects_controller.rb +++ b/app/controllers/subjects_controller.rb @@ -282,7 +282,7 @@ class SubjectsController < ApplicationController # 删除实训 # DELETE: /api/subejcts/:id/delete_member def delete_member - tip_exception(403, "没权限操作") if !current_user.admin? + tip_exception(403, "没权限操作") unless current_user.manager_of_subject?(@subject) tip_exception('用户id不能为空') if params[:user_id].blank? user = @subject.subject_members.where(:user_id => params[:user_id], :role => 2).first tip_exception("管理员用户不允许删除,或用户不存在") if user.blank? diff --git a/app/views/subjects/up_member_position.json.jbuilder b/app/views/subjects/up_member_position.json.jbuilder index 410b5641b..64038f419 100644 --- a/app/views/subjects/up_member_position.json.jbuilder +++ b/app/views/subjects/up_member_position.json.jbuilder @@ -1,3 +1,4 @@ json.members @subject.subject_members do |member| json.partial! 'subject_member', locals: { user: member.user } + json.role member.role end \ No newline at end of file diff --git a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js index a438e78a8..dfdc6291a 100644 --- a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js +++ b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js @@ -246,9 +246,32 @@ class CoursesBanner extends Component { }) var url = `/courses/${id}/duplicate_course.json` axios.post(url).then((response) => { + if(response!==undefined){ + window.location.href = "/courses/" + response.data.new_course_id+"/students"; + }else { + this.modalCancel(); + } // window.location.href = "/courses/" + response.data.new_course_id; - window.location.href = "/courses/" + response.data.new_course_id+"/students"; - }) + + }).catch(function (error) { + this.modalCancel(); + console.log(252); + console.log(error); + }); + + // axios.interceptors.response.use((response) => { + // if (response != undefined) + // if (response && response.data.status === -1) { + // this.setState({ + // antIcon: false, + // }) + // + // } + // return response; + // }, (error) => { + // //TODO 这里如果样式变了会出现css不加载的情况 + // + // }); } if(this.state.metype===6){ diff --git a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js index 511c40d61..1041bb284 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js @@ -72,7 +72,8 @@ class ShixunStudentWork extends Component { showmodel:false, jobsettingsdata:undefined, DownloadType:false, - DownloadMessageval:undefined + DownloadMessageval:undefined, + lunxun:true, } } @@ -121,6 +122,7 @@ class ShixunStudentWork extends Component { getupdata=(pages)=>{ let {order,b_order,page,limit,group_infolist,search}=this.state; + var homeworkid = this.props.match.params.homeworkid; let url = "/homework_commons/" + homeworkid + "/code_review_results.json"; @@ -152,8 +154,17 @@ class ShixunStudentWork extends Component { this.setState({ data: response.data, datalist:datas - }) + }); } + this.setState({ + lunxun:false, + }) + }else{ + setInterval(() => { + if(this.state.lunxun===true){ + this.getupdata(); + } + }, 1000); } }