From 20c2dda047b451f64348a31c296e64b002959853 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, 19 Jul 2019 21:17:12 +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

---
 public/react/src/modules/courses/new/CoursesNew.js | 10 +++++++++-
 public/react/src/modules/login/LoginDialog.js      |  9 +++++++--
 public/react/src/modules/tpm/NewHeader.js          |  4 +---
 public/react/src/search/SearchPage.js              |  2 +-
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/public/react/src/modules/courses/new/CoursesNew.js b/public/react/src/modules/courses/new/CoursesNew.js
index f3442b8b7..e126027ec 100644
--- a/public/react/src/modules/courses/new/CoursesNew.js
+++ b/public/react/src/modules/courses/new/CoursesNew.js
@@ -40,6 +40,8 @@ class CoursesNew extends Component {
     }
 
     componentDidMount() {
+
+
         let coursesId = this.props.match.params.coursesId;
         let user_school=this.props.current_user&&this.props.current_user.user_school;
 
@@ -85,7 +87,13 @@ class CoursesNew extends Component {
 			 this.Searchvalue("")
 
     }
-
+		componentDidUpdate(prevProps){
+			if(prevProps.current_user!=this.props.current_user){
+				if(this.props.current_user.user_identity==="学生"){
+					window.location.href ="/403"
+				}
+			}
+		}
     onChangeTimepublishs = (date, dateString) => {
         if(dateString===""){
             this.setState({
diff --git a/public/react/src/modules/login/LoginDialog.js b/public/react/src/modules/login/LoginDialog.js
index a5f0529e0..f3f4ceadf 100644
--- a/public/react/src/modules/login/LoginDialog.js
+++ b/public/react/src/modules/login/LoginDialog.js
@@ -7,7 +7,7 @@ import Dialog, {
   DialogContentText,
   DialogTitle,
 } from 'material-ui/Dialog';
-
+import {notification } from 'antd';
 
 import axios from 'axios';
 
@@ -349,7 +349,12 @@ class LoginDialog extends Component {
             if(response.status===200){
                 if (response.data.status === 402) {
                     window.location.href = response.data.url;
-                }else{
+                }else if (response.data.status === -2) {
+									notification.open({
+										message: '提示',
+										description:response.data.message,
+									});
+								}else{
                     broadcastChannelPostMessage('refreshPage')
                     this.setState({
                         isRender:false
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index 43152a074..10a6ec054 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -792,9 +792,7 @@ submittojoinclass=(value)=>{
               <div className="edu-menu-list"  style={{top: '60px',width:"240px"}}>
                 <div className="overPart"></div>
                 <ul className="fl with50 edu-txt-center pr ul-leftline">
-									{console.log(this.props)}
-									{console.log(this.state)}
-                  <li><Link to={"/courses/new"}>新建课堂</Link></li>
+									{this.props.current_user&&this.props.current_user.user_identity==="学生"?"":<li><Link to={"/courses/new"}>新建课堂</Link></li>}
                   <li><a href="/shixuns/new">新建实训</a></li>
                   <li><a href={this.props.Headertop===undefined?"":"/paths/new"}>新建实践课程</a></li>
                   <li><a href={this.props.Headertop===undefined?"":this.props.Headertop.new_project_url} target="_blank">新建项目</a></li>
diff --git a/public/react/src/search/SearchPage.js b/public/react/src/search/SearchPage.js
index 5b1ae7f64..3f12bf33a 100644
--- a/public/react/src/search/SearchPage.js
+++ b/public/react/src/search/SearchPage.js
@@ -169,7 +169,7 @@ class SearchPage extends Component{
 										return (
 											<a key={key}
 											  href={
-													item.type==="shixun"?`/shixuns/${item.identifier}/challenges`:item.type==="course"?`/courses/${item.id}/students`:item.type==="subject"?`/courses/${item.id}/students`:item.type==="memo"?`/forums/${item.id}`:""
+													item.type==="shixun"?`/shixuns/${item.identifier}/challenges`:item.type==="course"?`/courses/${item.id}/students`:item.type==="subject"?`/paths/${item.id}`:item.type==="memo"?`/forums/${item.id}`:""
 												}
 												 target="_blank"
 											>