From 8f3203ed7c4c3d099d3099de01becccdbc8b0791 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Wed, 4 Sep 2019 17:40:28 +0800 Subject: [PATCH 1/2] isCourseEnd --- public/react/src/modules/courses/boards/BoardsNew.js | 4 ++-- public/react/src/modules/courses/boards/index.js | 2 +- public/react/src/modules/courses/members/studentsList.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/public/react/src/modules/courses/boards/BoardsNew.js b/public/react/src/modules/courses/boards/BoardsNew.js index a08225c1f..0222907d3 100644 --- a/public/react/src/modules/courses/boards/BoardsNew.js +++ b/public/react/src/modules/courses/boards/BoardsNew.js @@ -287,7 +287,7 @@ class BoardsNew extends Component{ const isAdmin = this.props.isAdmin() const courseId=this.props.match.params.coursesId; const boardId = this.props.match.params.boardId - + const isCourseEnd = this.props.isCourseEnd() return(
{menu} { - isAdmin && + isAdmin && !isCourseEnd &&
this.refs['addDirModal'].open()}> diff --git a/public/react/src/modules/courses/boards/index.js b/public/react/src/modules/courses/boards/index.js index 6a563762b..6d1c402ce 100644 --- a/public/react/src/modules/courses/boards/index.js +++ b/public/react/src/modules/courses/boards/index.js @@ -388,7 +388,7 @@ class Boards extends Component{ return
  • this.moveTo(item)} title={item.name}>{item.name}
  • }) } - { isAdmin && + { isAdmin && !isCourseEnd &&

    this.addDir()} diff --git a/public/react/src/modules/courses/members/studentsList.js b/public/react/src/modules/courses/members/studentsList.js index 46e6ad77d..bca65375c 100644 --- a/public/react/src/modules/courses/members/studentsList.js +++ b/public/react/src/modules/courses/members/studentsList.js @@ -675,7 +675,7 @@ class studentsList extends Component{ ) }) } { course_groups && course_groups.length > 0 && } - { isAdmin && + { isAdmin && !isCourseEnd &&

    Date: Wed, 4 Sep 2019 17:42:38 +0800 Subject: [PATCH 2/2] encodeURI --- .../src/modules/paths/PathDetail/DetailCardsEditAndEdit.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js index e98132252..b4b8cb536 100644 --- a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js +++ b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js @@ -95,7 +95,7 @@ class DetailCardsEditAndEdit extends Component{ if(id!=0){ url+="&type="+id; } - axios.get(url).then((result)=>{ + axios.get(encodeURI(url)).then((result)=>{ if(result.status===200){ this.setState({ ChooseShixunList:result.data, @@ -369,7 +369,7 @@ class DetailCardsEditAndEdit extends Component{ if(type!=0){ url+="&type="+type; } - axios.get(url).then((result)=>{ + axios.get(encodeURI(url)).then((result)=>{ if(result.status===200){ let list =result.data.shixun_list;