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

public/react/src/modules/courses/completetaskdetails/Completetaskpage.js

@@ -81,6 +81,7 @@ class Completetaskpage extends Component {
 							tos:`/banks/gtask/${workids}/edit/${this.props.match.params.type}`,
 							id:workids,
 							is_public:response && response.data && response.data.is_public,
+							type:this.props.match.params.type,
 						}
 						this.setState({
 							banksMenu:menuData

public/react/src/modules/courses/comtopicdetails/CompletetopicdePage.js

@@ -76,6 +76,7 @@ class CompletetopicdePage extends Component {
 							tos:`/banks/gtopic/${workids}/edit/${this.props.match.params.type}`,
 							id:workids,
 							is_public:response && response.data && response.data.is_public,
+							type:this.props.match.params.type,
 						}
 						this.setState({
 							banksMenu:menuData

public/react/src/modules/courses/groupjobbank/GroupjobbankPage.js

@@ -86,6 +86,7 @@ class GroupjobbankPage extends Component {
 							tos:`/banks/group/${workids}/edit/${this.props.match.params.type}`,
 							id:workids,
 							is_public:response && response.data && response.data.is_public,
+							type:this.props.match.params.type,
 						}
 						this.setState({
 							banksMenu:menuData

public/react/src/modules/courses/questionbank/Generaljobbankdetails.js

@@ -86,6 +86,7 @@ class Generaljobbankdetails extends Component {
 							tos:`/banks/normal/${workids}/edit/${this.props.match.params.type}`,
 							id:workids,
 							is_public:response && response.data && response.data.is_public,
+							type:this.props.match.params.type,
 						}
 						this.setState({
 									banksMenu:menuData

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

@@ -33,7 +33,7 @@ class ExerciseBanksDetail extends Component{
         tos: `/banks/exercise/${Id}/edit/${this.props.match.params.type}`,
         id: Id,
         is_public: result.data.exercise && result.data.exercise.is_public,
-
+        type:this.props.match.params.type,
     }
     this.props.initPublic(crumbData,menuData);
   }

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

@@ -42,7 +42,7 @@ class PollBanksContent extends Component{
           tos:`/banks/poll/${bankId}/edit/${this.props.match.params.type}`,
           id:bankId,
           is_public:result.data.poll && result.data.poll.is_public,
-
+          type:this.props.match.params.type,
         }
         this.props.initPublic(crumbData,menuData);
         this.setState({

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

@@ -151,11 +151,31 @@ class BanksMenu extends Component{
           <WordsBtn onClick={()=>this.sendTopics()} style="blue" className="ml20 font-16">发送</WordsBtn>
         </span>
           :
-          <span className="fr mt18">
+          (banksMenu&&banksMenu.type==="publicly"?
-          <WordsBtn onClick={()=>this.deletecheckBoxValues(banksMenu&&banksMenu.id,banksMenu&&banksMenu.category)}style="blue" className="ml20 font-16">删除</WordsBtn>
+              (
-          <WordsBtn to={ banksMenu.tos ? banksMenu.tos:""} style="blue" className="ml20 font-16">编辑</WordsBtn>
+                banksMenu===undefined?
-          <WordsBtn onClick={()=>this.sendTopics()} style="blue" className="ml20 font-16">发送</WordsBtn>
+                  <span className="fr mt18">
-        </span>
+                  <WordsBtn onClick={()=>this.deletecheckBoxValues(banksMenu&&banksMenu.id,banksMenu&&banksMenu.category)}style="blue" className="ml20 font-16">删除</WordsBtn>
+                  <WordsBtn to={ banksMenu.tos ? banksMenu.tos:""} style="blue" className="ml20 font-16">编辑</WordsBtn>
+                  <WordsBtn onClick={()=>this.sendTopics()} style="blue" className="ml20 font-16">发送</WordsBtn>
+                  </span>
+                 :banksMenu.is_public===true?
+                  <span className="fr mt18">
+                  <WordsBtn onClick={()=>this.sendTopics()} style="blue" className="ml20 font-16">发送</WordsBtn>
+                  </span>
+                  :
+                  <span className="fr mt18">
+                  <WordsBtn onClick={()=>this.deletecheckBoxValues(banksMenu&&banksMenu.id,banksMenu&&banksMenu.category)}style="blue" className="ml20 font-16">删除</WordsBtn>
+                  <WordsBtn to={ banksMenu.tos ? banksMenu.tos:""} style="blue" className="ml20 font-16">编辑</WordsBtn>
+                  </span>
+              )
+          :
+              <span className="fr mt18">
+              <WordsBtn onClick={()=>this.deletecheckBoxValues(banksMenu&&banksMenu.id,banksMenu&&banksMenu.category)}style="blue" className="ml20 font-16">删除</WordsBtn>
+              <WordsBtn to={ banksMenu.tos ? banksMenu.tos:""} style="blue" className="ml20 font-16">编辑</WordsBtn>
+              <WordsBtn onClick={()=>this.sendTopics()} style="blue" className="ml20 font-16">发送</WordsBtn>
+              </span>
+          )
         }
 
       </div>