From 6b3d4a70c8d7c046c08311453673f50287c65511 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 23 Jul 2019 18:31:01 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/subjects_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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|

From bc30821a5b13104d6cbb4beedc1188d11ff729eb Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Tue, 23 Jul 2019 18:32:54 +0800
Subject: [PATCH 2/2] rename

---
 .../modules/courses/busyWork/commonWork.js    | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

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,