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

---
 .../src/modules/courses/Resource/Fileslistitem.js      |  8 ++------
 .../src/modules/courses/exercise/ExerciseListItem.js   |  6 ++----
 .../courses/graduation/tasks/GraduateTaskItem.js       |  7 ++-----
 .../courses/graduation/topics/GraduateTopicItem.js     | 10 ++++++----
 .../courses/shixunHomework/ShixunhomeWorkItem.js       |  6 ++----
 5 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/public/react/src/modules/courses/Resource/Fileslistitem.js b/public/react/src/modules/courses/Resource/Fileslistitem.js
index a2f57a8e1..404214dfc 100644
--- a/public/react/src/modules/courses/Resource/Fileslistitem.js
+++ b/public/react/src/modules/courses/Resource/Fileslistitem.js
@@ -215,13 +215,9 @@ class Fileslistitem extends Component{
                       }
 
                         {
-                       this.props.isNotMember ? discussMessage.is_lock === true ?
+                       this.props.isNotMember ?
                                 <span className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.title}</span>
-                                :
-                                <a
-                                    onClick={this.showfiles}
-                                    // href={"/courses/" + coursesId + "/graduation/graduation_tasks/" + categoryid + "/" + taskid + "/list"}
-                                    className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.title}</a> :""
+                                :""
                         }
 
 
diff --git a/public/react/src/modules/courses/exercise/ExerciseListItem.js b/public/react/src/modules/courses/exercise/ExerciseListItem.js
index f11509fc8..8ffd16937 100644
--- a/public/react/src/modules/courses/exercise/ExerciseListItem.js
+++ b/public/react/src/modules/courses/exercise/ExerciseListItem.js
@@ -107,11 +107,9 @@ class ExerciseListItem extends Component{
 												}
 
                         {
-                        this.props.isNotMember()? item.lock_status === 0 ?
+                        this.props.isNotMember()?
                                 <span className="fl mt3 font-16 font-bd color-dark comnonwidth580" title={item.exercise_name}>{item.exercise_name}</span>
-                                :
-
-                                <a  className="fl font-16 font-bd mt2 color-grey-3 task-hide comnonwidth580" title={item.exercise_name} href={`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`}>{item.exercise_name}</a>:""
+                                :""
                         }
 
                         {
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js
index f66874330..10ce65436 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js
@@ -229,12 +229,9 @@ class GraduateTaskItem extends Component{
               }
 
               {
-            this.props.isNotMember?this.props.discussMessage.private_icon===true?
+            this.props.isNotMember?
                   <span className="fl mt3 font-16 font-bd color-dark maxwidth580" title={discussMessage.name}>{discussMessage.name}</span>
-                  :
-                  <a href={"/courses/"+coursesId+"/graduation_tasks/"+categoryid+"/"+taskid+"/list"}
-										 title={discussMessage.name}
-                     className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:""
+             :""
               }
 
 
diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js
index c5130d299..9f61e69d4 100644
--- a/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js
+++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js
@@ -70,15 +70,17 @@ class GraduateTopicItem extends Component{
           `}</style>
             <h6>
               {
-                isNotMember && discussMessage.private_icon===true ?
-                  <a className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:
-                  <a onClick={() => this.toDetailPage(`${discussMessage.id}`)} className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>
+                isNotMember?
+                  <a className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:""
+
               }
               {
                 isStudent?<a onClick={() => this.toDetailPage(`${discussMessage.id}`)}
                              className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:""
               }
-
+							{
+								isAdmin?<a onClick={() => this.toDetailPage(`${discussMessage.id}`)} className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:""
+							}
               {
                discussMessage.private_icon===true?
                   <Tooltip  title={ this.props.isNotMember()===true?"私有属性，非课堂成员不能访问":"私有属性"}  placement="bottom">
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
index d6c96182b..06f22c87e 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
@@ -304,11 +304,9 @@ class ShixunhomeWorkItem extends Component{
               }
 
               {
-                this.props.isNotMember?this.props.discussMessage.private_icon===true?
+                this.props.isNotMember?
                   <span className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</span>
-                  :
-                  <Link to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/openlist`}
-                     className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</Link>:""
+                  : ""
               }