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

# Conflicts:
#	public/react/src/modules/user/usersInfo/banks/BanksIndex.js

public/react/src/modules/courses/busyWork/NewWorkForm.js

@@ -191,6 +191,7 @@ class NewWorkForm extends Component{
   }
   
   onAttachmentRemove = (file, stateName) => {
+ 		if(file.response!=undefined){
       this.props.confirm({
         content: '是否确认删除?',
         
@@ -201,8 +202,7 @@ class NewWorkForm extends Component{
           console.log('Cancel');
         },
       });
-
+    }
-    
     return false;
   }
   deleteAttachment = (file, stateName) => {

public/react/src/modules/user/usersInfo/banks/BanksIndex.js

@@ -92,10 +92,21 @@ class BanksIndex extends Component{
 										 }
 									 }></Route>
 
-            <Route path='/banks/homework/:workId/edit' 
+
+            <Route path='/banks/normal/:workId/edit'
+              render={
+                (props) => {
+                  return (<HomeworkBanksEdit {...this.props} {...props} {...this.state} {...common}
+                    isGroup={false}
+                  />)
+                }
+            }></Route>
+            <Route path='/banks/group/:workId/edit'
               render={
                 (props) => {
-                  return (<HomeworkBanksEdit {...this.props} {...props} {...this.state} {...common}/>)
+                  return (<HomeworkBanksEdit {...this.props} {...props} {...this.state} {...common}
+                    isGroup={true}
+                  />)
                 }
             }></Route>
 

public/react/src/modules/user/usersInfo/banks/HomeworkBanksEdit.js

@@ -9,7 +9,7 @@ class HomeworkBanksEdit extends Component {
     super(props);
     this.state = {
       isPublic: undefined,
-      isGroup: false
+    //   isGroup: false
     }
   }
   componentDidMount = () =>{
@@ -26,14 +26,14 @@ class HomeworkBanksEdit extends Component {
           title:'编辑',
           is_public:result && result.data && result.data.is_public,
           crumbArray:[
-            {to:`/banks/homework/${workId}/edit`,content:'详情'},
+            {to:`/banks/${this.getModuleName()}/${workId}/edit`,content:'详情'},
             {content:'编辑'}
           ]
         }
         this.props.initPublic(crumbData);
         result.data.isEdit = true;
         result.data.ref_attachments = result.data.reference_attachments
-        this.setState({ isGroup: result.data.min_num || result.data.max_num })
+        // this.setState({ isGroup: result.data.min_num || result.data.max_num })
         this.newWorkFormRef.initValue(result.data);
       }
     }).catch((error)=>{
@@ -60,14 +60,17 @@ class HomeworkBanksEdit extends Component {
       console.log(error);
     });   
   }
+  getModuleName = () => {
+    return this.props.isGroup ? 'group' : 'normal'
+  }
   toWorkDetail = () => {
-    this.props.history.push(`/banks/homework/${this.props.match.params.workId}`)
+    this.props.history.push(`/banks/${this.getModuleName()}/${this.props.match.params.workId}`)
   }
   onCancel = () => {
     this.toWorkDetail()
   }
   isGroup = () => {
-    return this.state.isGroup;
+    return this.props.isGroup;
   }
   render(){
     let { bankId } = this.props.match.params