From 2ff1b00f1aced5005642b03cb35b12dd695ddf60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Wed, 4 Sep 2019 09:13:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/user/usersInfo/InfosBanner.js |  5 ++++
 .../src/modules/user/usersInfo/InfosTopics.js | 30 ++++++++++++++-----
 .../src/modules/user/usersInfo/usersInfo.css  |  2 +-
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/public/react/src/modules/user/usersInfo/InfosBanner.js b/public/react/src/modules/user/usersInfo/InfosBanner.js
index c2f2c7ff4..99afce1d0 100644
--- a/public/react/src/modules/user/usersInfo/InfosBanner.js
+++ b/public/react/src/modules/user/usersInfo/InfosBanner.js
@@ -30,6 +30,11 @@ class InfosBanner extends Component{
     let user_id=this.props.current_user&&this.props.current_user.user_id;
 		let user_type=this.props.current_user&&this.props.current_user.user_identity;
 		let targetuserid=this.props.data&&this.props.data.id;
+
+		// console.log(is_current)
+		// console.log(current_user)
+		// console.log(current_user.is_teacher)
+		// console.log(current_user.admin)
     return(
       <div className="bannerPanel mb60">
         <div className="educontent">
diff --git a/public/react/src/modules/user/usersInfo/InfosTopics.js b/public/react/src/modules/user/usersInfo/InfosTopics.js
index 8f0c27a6b..c84f23d32 100644
--- a/public/react/src/modules/user/usersInfo/InfosTopics.js
+++ b/public/react/src/modules/user/usersInfo/InfosTopics.js
@@ -271,6 +271,10 @@ class InfosTopics extends Component{
 			visible,
 			isshowprofes
 		} = this.state;
+		let {
+			is_current,
+			current_user,
+		}=this.props;
 
 		let categorylist=[
 			{val:"普通作业",type:"normal"},
@@ -291,6 +295,12 @@ class InfosTopics extends Component{
 		let user_type=this.props.current_user&&this.props.current_user.user_identity;
 		let targetuserid=this.props.data&&this.props.data.id;
 
+
+
+		// console.log(is_current)
+		// console.log(current_user)
+		// console.log(current_user.is_teacher)
+		// console.log(current_user.admin)
 		const menu = (
 			<Menu>
 				<Menu.Item onClick={()=>this.updatedlist("updated_at")}>
@@ -456,8 +466,10 @@ class InfosTopics extends Component{
 											</sapn>
 										</span>
 								</Dropdown>
-						  	{user_id===targetuserid&&user_type!="学生"?<span className="fr mr30 topcsactive pointer" onClick={()=>this.sendTopics()}>发送</span>:""}
-								{types==="personal"?user_id===targetuserid&&user_type!="学生"?<span className="fr mr30 topcsactive pointer" onClick={()=>this.deletecheckBoxValues()}>删除</span>:"":""}
+							{((is_current && current_user && current_user.is_teacher ) || current_user && current_user.admin)
+							&&<span className="fr mr30 topcsactive pointer" onClick={()=>this.sendTopics()}>发送</span>}
+								{types==="personal"?((is_current && current_user && current_user.is_teacher ) || current_user && current_user.admin)
+									&&<span className="fr mr30 topcsactive pointer" onClick={()=>this.deletecheckBoxValues()}>删除</span>:""}
 						</p>
 					</div>:""}
 
@@ -471,10 +483,11 @@ class InfosTopics extends Component{
 								<div className="item-body">
 
 									<div className="clearfix ds pr pt5 contentSection" >
-										{user_type!="学生"?<Checkbox value={item.id} key={item.id} className={"fl mt5"}></Checkbox>:""}
+										{((is_current && current_user && current_user.is_teacher ) || current_user && current_user.admin)
+										&&<Checkbox value={item.id} key={item.id} className={"fl mt5"}></Checkbox>}
 
 
-									  <a title={item.name} className="ml10 fl mt3 font-16  color-dark maxwidth900" href={
+									  <a title={item.name.length>55?item.name:""} className="ml10 fl mt3 font-16  color-dark maxwidth900" href={
 											category==="normal"?`/banks/normal/${item.id}?tab=0`:
 												category==="group"?`/banks/group/${item.id}?tab=0`:
 													category==="poll"?`/banks/poll/${item.id}`:
@@ -505,8 +518,8 @@ class InfosTopics extends Component{
 										</p>
 
 										<div className="homepagePostSetting homepagePostSettingname topscisright">
-											{types==="personal"?user_id===targetuserid&&user_type!="学生"?
-												<a className="btn colorblue mr25 font-16 fr"
+											{types==="personal"?((is_current && current_user && current_user.is_teacher ) || current_user && current_user.admin)
+												&&<a className="btn colorblue mr25 font-16 fr"
 													 href={category==="normal"?`/banks/normal/${item.id}/edit`:
 														 category==="group"?`/banks/group/${item.id}/edit`:
 															 category==="poll"?`/banks/poll/${item.id}/edit`:
@@ -515,8 +528,9 @@ class InfosTopics extends Component{
 																		 category==="gtopic"?`/banks/gtopic/${item.id}/edit`:""
 													 }
 												>编辑</a>
-												:"":""}
-											{types==="personal"&&item.is_public===false?user_id===targetuserid&&user_type!="学生"?<a className="btn colorblue mr25 fr font-16" onClick={()=>this.openTopics(item.id)}>设为公开</a>:"":""}
+												:""}
+											{types==="personal"&&item.is_public===false?((is_current && current_user && current_user.is_teacher ) || current_user && current_user.admin)
+												&&<a className="btn colorblue mr25 fr font-16" onClick={()=>this.openTopics(item.id)}>设为公开</a>:""}
 
 										</div>
 									</div>
diff --git a/public/react/src/modules/user/usersInfo/usersInfo.css b/public/react/src/modules/user/usersInfo/usersInfo.css
index c038fd4b8..0801e46e2 100644
--- a/public/react/src/modules/user/usersInfo/usersInfo.css
+++ b/public/react/src/modules/user/usersInfo/usersInfo.css
@@ -341,7 +341,7 @@
 
 .pd1323{
     padding: 10px 6px 25px 40px;
-    cursor: pointer;
+    /*cursor: pointer;*/
 }
 .pd1323:hover {
     box-shadow: 0px 2px 6px rgba(51,51,51,0.09);