From 6787d59ec17161fb8b3cdff304265f6c162b26e5 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Thu, 20 Jun 2019 17:17:04 +0800 Subject: [PATCH 1/5] font-16 --- .../modules/courses/common/titleSearch/TitleSearchSection.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/common/titleSearch/TitleSearchSection.js b/public/react/src/modules/courses/common/titleSearch/TitleSearchSection.js index c6530e855..4cb69a8d7 100644 --- a/public/react/src/modules/courses/common/titleSearch/TitleSearchSection.js +++ b/public/react/src/modules/courses/common/titleSearch/TitleSearchSection.js @@ -62,7 +62,7 @@ class Titlesearchsection extends Component{

{title} -

  • +
  • { firstRowRight }

    • From 01fd748038d54aa709630d9e48b0445dad287fcf Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Thu, 20 Jun 2019 17:19:48 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=85=88=E6=B3=A8=E9=87=8A=E4=BA=86?= =?UTF-8?q?=EF=BC=8C=E5=BD=B1=E5=93=8D=E5=88=B0=E4=BA=86md=E7=9A=84?= =?UTF-8?q?=E6=8B=96=E6=8B=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/forums/MemoDetailMDEditor.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/public/react/src/modules/forums/MemoDetailMDEditor.js b/public/react/src/modules/forums/MemoDetailMDEditor.js index 17bc11212..caf8e5743 100644 --- a/public/react/src/modules/forums/MemoDetailMDEditor.js +++ b/public/react/src/modules/forums/MemoDetailMDEditor.js @@ -158,13 +158,15 @@ class MemoDetailMDEditor extends Component {
    From 268baa136d26846078621846f06f97498c732b67 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Thu, 20 Jun 2019 19:03:00 +0800 Subject: [PATCH 3/5] canNotLink --- .../src/modules/courses/busyWork/CommonWorkItem.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/public/react/src/modules/courses/busyWork/CommonWorkItem.js b/public/react/src/modules/courses/busyWork/CommonWorkItem.js index 41b873bac..258a06332 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkItem.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkItem.js @@ -104,6 +104,7 @@ class CommonWorkItem extends Component{ let coursesId = this.props.match.params.coursesId; const isStudent = this.props.isStudent() + const isAdmin = this.props.isAdmin() const isAdminOrStudent = this.props.isAdminOrStudent() return(
    @@ -128,19 +129,20 @@ class CommonWorkItem extends Component{ { mainList && mainList.homeworks.length>0 && mainList.homeworks.map((item,index)=>{ + let canNotLink = !isAdminOrStudent && item.private_icon == true return(
    { - mainList && mainList.course_identity < 5 && + mainList && isAdmin && }
    this.props.onItemClick(Object.assign({}, item, {id: item.homework_id})) }>

    this.onItemClick(item)} + className="fl font-16 font-bd mt2 comnonwidth580" style={{cursor: canNotLink ? 'normal' : 'poninter'}} + onClick={canNotLink ? () => {} : () => this.onItemClick(item)} >{item.name} {/* 只有非课堂成员且作业是私有的情况下才会为true */} @@ -155,7 +157,7 @@ class CommonWorkItem extends Component{ { - mainList && mainList.course_identity < 5 && + mainList && isAdmin &&

    • From 07e5760e2b0b067e8cb8457836619a95488b45e2 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Thu, 20 Jun 2019 19:06:46 +0800 Subject: [PATCH 4/5] this.props.addSuccess --- .../graduation/tasks/GraduationTasksappraiseReplyChild.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReplyChild.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReplyChild.js index 094f8d96f..1279b4907 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReplyChild.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReplyChild.js @@ -83,7 +83,7 @@ class GraduationTasksappraiseReplyChild extends Component{
    • */} {this.props.ultimate===true?"": isAdmin && this.props.addSuccess()} > }