Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/views/subjects/show.json.jbuilder

@@ -10,7 +10,7 @@ json.publish_status publish_status(@subject, @is_creator, @user, @shixuns)
 json.allow_statistics @user.manager_of_subject?(@subject)
 json.allow_send @user.logged?
 json.allow_visit @user.manager_of_subject?(@subject) || @user.admin? || @subject.status > 1
-json.allow_add_member @user.admin?
+json.allow_add_member @user.manager_of_subject?(@subject)
 
 json.members @members do |member|
   json.partial! 'subject_member', locals: { user: member.user }

public/react/src/App.js

@@ -258,7 +258,12 @@ class App extends Component {
 		// 	//TODO 这里如果样式变了会出现css不加载的情况
 		// });
 	}
-
+	//修改登录方法
+	Modifyloginvalue=()=>{
+		this.setState({
+			isRender:false,
+		})
+	}
 
 	render() {
 
@@ -268,7 +273,7 @@ class App extends Component {
 
 
 				<MuiThemeProvider theme={theme}>
-					<LoginDialog {...this.props} {...this.state}></LoginDialog>
+					<LoginDialog {...this.props} {...this.state}  Modifyloginvalue={()=>this.Modifyloginvalue()}></LoginDialog>
 					<Notcompletedysl {...this.props} {...this.state}></Notcompletedysl>
 					<Trialapplicationysl  {...this.props} {...this.state}></Trialapplicationysl>
 					<Trialapplicationreview  {...this.props} {...this.state}></Trialapplicationreview>

public/react/src/AppConfig.js

@@ -18,9 +18,10 @@ function locationurl(list){
 }
 
 // TODO 开发期多个身份切换
-const debugType =window.location.search.indexOf('debug=t') != -1 ? 'teacher' :
+const debugType =""
-        window.location.search.indexOf('debug=s') != -1 ? 'mfp2guqj3' : 'admin'
+// 	window.location.search.indexOf('debug=t') != -1 ? 'teacher' :
-window._debugType = debugType;
+//         window.location.search.indexOf('debug=s') != -1 ? 'student' : 'admin'
+// window._debugType = debugType;
 export function initAxiosInterceptors(props) {
 
     // TODO 避免重复的请求 https://github.com/axios/axios#cancellation

public/react/src/modules/courses/coursesPublic/Addcourses.js

@@ -49,10 +49,22 @@ class Addcourses extends Component{
     })
 
   }
-
+	openNotification = (messge) => {
+		notification.open({
+			message: "提示",
+			description:
+			messge,
+			onClick: () => {
+				console.log('Notification Clicked!');
+			},
+		});
+	};
 
   inputjoinclassvalue=(e)=>{
-
+		if(e.target.value.length>=7){
+			this.openNotification("请输入5位课堂邀请码或6位分班邀请码!");
+			return
+		}
     this.setState({
       invite_code:e.target.value
     })
@@ -198,7 +210,9 @@ class Addcourses extends Component{
       student:student
       }
     ).then((response) => {
-
+			if(response  === undefined){
+				return
+			}
       if(response.data.status===0){
         // course_id: 1545
         // message: "成功"

public/react/src/modules/login/LoginDialog.js

@@ -329,6 +329,11 @@ class LoginDialog extends Component {
 			this.setState({
 				isRender: false
 			})
+      try {
+        this.props.Modifyloginvalue();
+      }catch (e) {
+
+      }
     }
 
     loginEDU=()=>{
@@ -370,11 +375,16 @@ class LoginDialog extends Component {
                     window.location.reload();
                 }
             }
+          try {
+            this.props.Modifyloginvalue();
+          }catch (e) {
 
+          }
         }).catch((error) => {
           console.log("356");
             console.log(error)
         })
+
     }
     onKeydowns=(e)=>{
         let {disabled}=this.state;
@@ -383,6 +393,9 @@ class LoginDialog extends Component {
             console.log(1)
         }
     }
+  getloginurl=(url)=>{
+    window.location.href = url;
+  }
     render() {
       let{open,login,speedy,loginValue,regular,isGoing,isGoingValue,disabled,bottonclass,
         dialogBox,shortcutnum,disabledType,gaincode,authCodeType,authCodeclass, isRender}=this.state;
@@ -403,7 +416,7 @@ class LoginDialog extends Component {
                       <i className="iconfont icon-shanchudiao"></i>
                   </div>
 
-                  <div id="log_reg_content">
+                  <div id="log_reg_content" >
                     <ul className="log_nav clearfix">
                       <li className={login==0?'active':''} onClick={()=>{this.enter(0)}}>登录</li>
                       {/*<li className={speedy==0?'active':''}  onClick={()=>{this.register(0)}}>快捷登录</li>*/}
@@ -475,8 +488,8 @@ class LoginDialog extends Component {
                             </span>
 
                             <span className="fr">
-                              <a href={"/changepassword"} className="mr3 color-grey-9">忘记密码</a><em className="vertical-line"></em>
+                              <a onClick={(url)=>this.getloginurl("/changepassword")} className="mr3 color-grey-9">忘记密码</a><em className="vertical-line"></em>
-                              <a href={"/register"} className="color-grey-9">注册</a>
+                              <a onClick={(url)=>this.getloginurl("/register")} className="color-grey-9">注册</a>
                             </span>
 
                           </p>

public/react/src/modules/tpm/NewHeader.js

@@ -12,7 +12,7 @@ import { getImageUrl, toPath } from 'educoder'
 
 import axios from 'axios';
 
-import { Modal,Checkbox ,Radio,Input,message } from 'antd';
+import { Modal,Checkbox ,Radio,Input,message,notification } from 'antd';
 
 import Addcourses from '../courses/coursesPublic/Addcourses';
 
@@ -113,6 +113,16 @@ class NewHeader extends Component {
     //
     // }
   }
+  openNotification = (messge) => {
+    notification.open({
+      message: "提示",
+      description:
+      messge,
+      onClick: () => {
+        console.log('Notification Clicked!');
+      },
+    });
+  };
   componentWillReceiveProps(newProps, oldProps) {
     this.setState({
       user:newProps.user
@@ -158,12 +168,38 @@ class NewHeader extends Component {
   }
 
   tojoinclass=()=>{
+    let{user} =this.state;
+    if(user===undefined){
+      this.setState({
+        isRender:true
+      })
+      return
+    }
+    if(user&&user.login===""){
+      this.setState({
+        isRender:true
+      })
+      return;
+    }
     this.setState({
       Addcoursestypes:true,
     })
   }
 
   tojoinitem=()=>{
+    let{user} =this.state;
+    if(user===undefined){
+      this.setState({
+        isRender:true
+      })
+      return
+    }
+    if(user&&user.login===""){
+      this.setState({
+        isRender:true
+      })
+      return;
+    }
     this.setState({
       tojoinitemtype:true
     })
@@ -235,7 +271,7 @@ class NewHeader extends Component {
     })
   }
   educoderlogin=()=>{
-    //退出账号
+    //登录账号
     this.setState({
       isRender:true
     })
@@ -305,21 +341,21 @@ submittojoinclass=(value)=>{
     return
   }
   let newrolearr=rolearr;
-  if(value===1){
+  // if(value===1){
     if(tojoinclasstitle.length<6){
       this.setState({
         code_notice:true
       })
       return
     }
-  }else if(value===0){
+  // }else if(value===0){
-    if(tojoinclasstitle.length<5){
+  //   if(tojoinclasstitle.length<5){
-      this.setState({
+  //     this.setState({
-        code_notice:true
+  //       code_notice:true
-      })
+  //     })
-      return
+  //     return
-    }
+  //   }
-  }
+  // }
   if(tojoinclasstitle===""||tojoinclasstitle===undefined){
     this.setState({
       code_notice:true
@@ -440,6 +476,11 @@ submittojoinclass=(value)=>{
   }
 
   inputjoinclassvalue=(e)=>{
+    console.log(e.target.value.length);
+    if(e.target.value.length>=7){
+      this.openNotification("请输入6位项目邀请码!");
+      return
+    }
     this.setState({
       tojoinclasstitle:e.target.value
     })
@@ -483,6 +524,35 @@ submittojoinclass=(value)=>{
 			}
 		)
 	}
+	//头部获取是否已经登录了
+	getUser=(url)=>{
+    console.log("点击了503")
+    console.log(url);
+    let{user} =this.state;
+    if(user===undefined){
+       this.setState({
+         isRender:true
+       })
+    return
+    }
+    if(user&&user.login===""){
+      this.setState({
+        isRender:true
+      })
+      return;
+    }
+    if(url !== undefined || url!==""){
+      window.location.href = url;
+    }
+  }
+
+  //修改登录方法
+  Modifyloginvalue=()=>{
+    this.setState({
+      isRender:false,
+    })
+  }
+
   render() {
     const isLogin = true;   // 这里不会出现未登录的情况，服务端在服务端路由时发现如果是未登录，则跳转到登录页了。
     const {match ,} = this.props;
@@ -529,12 +599,12 @@ submittojoinclass=(value)=>{
     //    rolearr:["",""],
     // console.log("618");
     // console.log(user_phone_binded);
-
     return (
 
       <div className="newHeader" id="nHeader"  >
 
 				{isRender===true?<LoginDialog
+               Modifyloginvalue={()=>this.Modifyloginvalue()}
                   {...this.state}
                   {...this.props}
               />:""}
@@ -705,10 +775,12 @@ 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">
-									{this.props.current_user&&this.props.current_user.user_identity==="学生"?"":<li><Link to={"/courses/new"}>新建课堂</Link></li>}
+									{this.props.current_user&&this.props.current_user.user_identity==="学生"?"":<li><a  onClick={(url)=>this.getUser("/courses/new")}>新建课堂</a></li>}
-                  <li><a href="/shixuns/new">新建实训</a></li>
+                  <li><a onClick={(url)=>this.getUser("/shixuns/new")}>新建实训</a></li>
-                  <li><a href={this.props.Headertop===undefined?"":"/paths/new"}>新建实践课程</a></li>
+                  {this.props.Headertop===undefined?"":
-                  <li><a href={"/projects/new"} target="_blank">新建项目</a></li>
+                    <li><a onClick={(url)=>this.getUser("/paths/new")} >新建实践课程</a></li>
+                  }
+                  <li><a onClick={(url)=>this.getUser("/projects/new")} target="_blank">新建项目</a></li>
                 </ul>
                 <ul className="fl with50 edu-txt-center">
 
@@ -739,12 +811,12 @@ submittojoinclass=(value)=>{
                             <label className="panel-form-label fl">项目邀请码：</label>
                             <Input type="text" className="input-60-40 fl mt5" name="invite_code"
 																	 style={{width: '275px'}}
-                                   placeholder="请输入5位项目邀请码或6位分班邀请码" value={tojoinclasstitle} onInput={this.inputjoinclassvalue}/>
+                                   placeholder="请输入6位项目邀请码" value={tojoinclasstitle} onInput={this.inputjoinclassvalue}/>
                           </li>
 
                           <p id="none_invite_code_notice"
                              className="color-orange none f12"
-                             style={{marginLeft: '90px',display:code_notice===true?'block':"none"}}>请输入5位项目邀请码或6位分班邀请码</p>
+                             style={{marginLeft: '90px',display:code_notice===true?'block':"none"}}>请输入6位项目邀请码</p>
 
                           <li className="clearfix ">