Merge branches 'dev_Ysm' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm

app/controllers/application_controller.rb

@@ -39,6 +39,7 @@ class ApplicationController < ActionController::Base
 		@user_course_identity = current_user.course_identity(@course)
 		if @user_course_identity > Course::STUDENT && @course.is_public == 0
 			tip_exception(401, "..") unless User.current.logged?
+			check_account
 			tip_exception(409, "您没有权限进入")
 		end
 		uid_logger("###############user_course_identity:#{@user_course_identity}")

public/react/src/modules/courses/common/CBreadcrumb.js

@@ -18,7 +18,10 @@ class CBreadcrumb extends Component{
           if (item.to) {
             return <React.Fragment>
               <WordsBtn style="grey" className="fl hovercolorblue" to={item.to}>{item.name}</WordsBtn>
-              <span className="color-grey-9 fl ml3 mr3">{separator || '&gt;'}</span>
+              {separator ? 
+                <span className="color-grey-9 fl ml3 mr3">{separator}</span> :
+                <span className="color-grey-9 fl ml3 mr3">&gt;</span>
+              }
             </React.Fragment>
           } else {
             return <span>{item.name}</span>

public/react/src/modules/courses/coursesDetail/CoursesBanner.js

@@ -498,13 +498,13 @@ class CoursesBanner extends Component {
 												</style>
 												<Breadcrumb separator="|" className={"mt5"}>
 													<Breadcrumb.Item href={"/courses/"+this.props.match.params.coursesId+"/teachers"}>
-														<span className="color-grey-c font-16">教师  {coursedata.teacher_count}</span>
+														<span className="color-grey-c font-16"><span className={"mr10"}>教师</span>  <span className={"mr10"}>{coursedata.teacher_count}</span></span>
 													</Breadcrumb.Item>
 													<Breadcrumb.Item href={"/courses/"+this.props.match.params.coursesId+"/students"}>
-														<span className="color-grey-c font-16">学生  {coursedata.student_count}</span>
+														<span className="color-grey-c font-16"><span className={"mr10 ml10"}>学生</span>  <span className={"mr10"}>{coursedata.student_count}</span></span>
 													</Breadcrumb.Item>
 													<Breadcrumb.Item>{coursedata.credit===null?"":
-														<span className="color-grey-c font-16">学分 {coursedata.credit}</span>
+														<span className="color-grey-c font-16"><span className={"mr10 ml10"}>学分</span> <span className={"mr10"}>{coursedata.credit}</span></span>
 													}</Breadcrumb.Item>
 												</Breadcrumb>
 

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

@@ -1112,16 +1112,20 @@ export default class TPMsettings extends Component {
 						// this.deleteAttachment(this.state.file);
 						this.setState({
 							file:undefined,
+							deleteisnot:true,
 							languagewrite:"",
 							systemenvironment:"",
 							testcoderunmode:"",
+							fileList:[]
 						})
 					}else {
 						this.setState({
 							file:undefined,
+							deleteisnot:true,
 							languagewrite:"",
 							systemenvironment:"",
 							testcoderunmode:"",
+							fileList:[]
 						})
 					}
 					// this.props.showNotification('提交成功！');
@@ -1154,16 +1158,20 @@ export default class TPMsettings extends Component {
 			// this.deleteAttachment(this.state.file);
 			this.setState({
 				file:undefined,
+				deleteisnot:true,
 				languagewrite:"",
 				systemenvironment:"",
 				testcoderunmode:"",
+				fileList:[]
 			})
 		}else {
 			this.setState({
 				file:undefined,
+				deleteisnot:true,
 				languagewrite:"",
 				systemenvironment:"",
 				testcoderunmode:"",
+				fileList:[]
 			})
 		}
 	}

public/react/src/modules/tpm/challengesnew/TPMchallengesnew.js

@@ -178,7 +178,9 @@ export default class TPMchallengesnew extends Component {
     }
 
     CreatePracticesend = () => {
-      this.setState({
+
+
+			this.setState({
         CreatePracticesendtype:true
       })
 
@@ -237,14 +239,15 @@ export default class TPMchallengesnew extends Component {
 					  exec_time:exec_time
         }).then((response) => {
             if (response.data.status === 1) {
-						$("html").animate({ scrollTop: 0 })
-
-							this.setState({
-									setopen: true,
-									CreatePracticesendtype:false,
-									tab2url: "/shixuns/" + id + "/challenges/"+response.data.challenge_id+"/tab=2",
-									tab3url: "/shixuns/" + id + "/challenges/"+response.data.challenge_id+"/tab=3",
-							})
+						// $("html").animate({ scrollTop: 0 })
+
+							window.location.href=`/shixuns/${id}/challenges/${response.data.challenge_id}/editcheckpoint`;
+							// this.setState({
+							// 		setopen: true,
+							// 		CreatePracticesendtype:false,
+							// 		tab2url: "/shixuns/" + id + "/challenges/"+response.data.challenge_id+"/tab=2",
+							// 		tab3url: "/shixuns/" + id + "/challenges/"+response.data.challenge_id+"/tab=3",
+							// })
 
             }
 					this.props.showSnackbar(response.data.messages);

public/react/src/modules/tpm/newshixuns/Newshixuns.js

@@ -635,16 +635,20 @@ class Newshixuns extends Component {
                         // this.deleteAttachment(this.state.file);
                         this.setState({
                             file:undefined,
+													  deleteisnot:true,
                             languagewrite:"",
                             systemenvironment:"",
                             testcoderunmode:"",
+														fileList:[]
                         })
                     }else {
                         this.setState({
                             file:undefined,
+												  	deleteisnot:true,
                             languagewrite:"",
                             systemenvironment:"",
                             testcoderunmode:"",
+													  fileList:[]
                         })
                     }
                     // this.props.showNotification('提交成功！');
@@ -676,16 +680,20 @@ class Newshixuns extends Component {
             // this.deleteAttachment(this.state.file);
             this.setState({
                 file:undefined,
+							  deleteisnot:true,
                 languagewrite:"",
                 systemenvironment:"",
                 testcoderunmode:"",
+								fileList:[]
             })
         }else {
             this.setState({
                 file:undefined,
+						  	deleteisnot:true,
                 languagewrite:"",
                 systemenvironment:"",
                 testcoderunmode:"",
+								fileList:[]
             })
         }
     }
@@ -754,7 +762,8 @@ class Newshixuns extends Component {
     handleChange = (info) => {
         console.log("handleChange1");
         let fileList = info.fileList;
-        this.setState({ fileList:fileList,
+        this.setState({
+					  fileList:fileList,
             deleteisnot:false});
     }
     onAttachmentRemove = (file) => {