diff --git a/app/controllers/subjects_controller.rb b/app/controllers/subjects_controller.rb index c8a679109..cc0e06a38 100644 --- a/app/controllers/subjects_controller.rb +++ b/app/controllers/subjects_controller.rb @@ -266,7 +266,7 @@ class SubjectsController < ApplicationController end def add_subject_members - tip_exception(403, "没权限操作") if !current_user.admin? + # tip_exception(403, "没权限操作") if !current_user.admin? tip_exception("user_ids 不能为空!") if params[:user_ids].blank? memberships = params[:user_ids] memberships.each do |member| diff --git a/public/react/src/modules/courses/busyWork/commonWork.js b/public/react/src/modules/courses/busyWork/commonWork.js index d1f6a8e0b..f9c34cfcf 100644 --- a/public/react/src/modules/courses/busyWork/commonWork.js +++ b/public/react/src/modules/courses/busyWork/commonWork.js @@ -11,7 +11,7 @@ import CommonWorkItem from './CommonWorkItem' import PublishRightnow from './PublishRightnow' import ConnectProject from './ConnectProject' -import { WordsBtn } from 'educoder' +import { WordsBtn, on, off } from 'educoder' import Modals from '../../modals/Modals' import NoneData from "../coursesPublic/NoneData" import Titlesearchsection from '../common/titleSearch/TitleSearchSection'; @@ -76,18 +76,29 @@ class commonWork extends Component{ } componentDidUpdate(prevProps, prevState) { if (prevProps.match.path != this.props.match.path) { - this.componentDidMount() + this._getList() } } - - componentDidMount(){ + _getList = () => { this.setState({ isSpin:true }) let {page,search,order}=this.state; this.getList(page,search,order); } + componentDidMount(){ + this._getList() + + on('updateNavSuccess', this.updateNavSuccess) + } + componentWillUnmount() { + off('updateNavSuccess', this.updateNavSuccess) + } + updateNavSuccess = () => { + this._getList() + } + useBankSuccess = (checkBoxValues, newWorkIdArray) => { this.setState({ page:1,