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

public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js

@@ -232,9 +232,9 @@ class ShixunHomeworkPage extends Component {
 								typelist={teacherdatapage === undefined ? [""] : teacherdatapage.homework_status}
 							/>
 							<a className="color-grey-9 fr font-16  summaryname  ml20 mr20" onClick={()=>this.gotohome()}>返回</a>
-							<a className="color-grey-9 fr font-16 mr20"
+							{teacherdatapage&&teacherdatapage.shixun_status>1?<a className="color-grey-9 fr font-16 mr20"
 								 href={`/shixuns/${teacherdatapage === undefined ? "" : teacherdatapage.shixun_identifier}/challenges`}
-								 target={"_blank"}>实训详情</a>
+								 target={"_blank"}>实训详情</a>:""}
 
 
 						</div>
@@ -336,10 +336,10 @@ class ShixunHomeworkPage extends Component {
 											<a className="fr color-blue font-16"
 												 href={`/courses/${this.props.match.params.coursesId}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.main ===  1 ? "shixun_homeworks" :"shixun_homework"}/${teacherdatapage === undefined ? "" : teacherdatapage.id}/commitsummary/${this.props.match.params.homeworkid}`}>{teacherdatapage.commit_des}</a>
 									}
-									{teacherdatapage === undefined ? "" : <Startshixuntask
+									{teacherdatapage === undefined ? "" :teacherdatapage&&teacherdatapage.shixun_status>1?<Startshixuntask
 										{...this.props}
 										data={teacherdatapage}
-									/>}
+									/>:""}
 									{this.props.isStudent() ?
 										(
 											teacherdatapage&&teacherdatapage.redo_work===true?

public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js

@@ -359,14 +359,14 @@ class ShixunhomeWorkItem extends Component{
 								}
 							</style>
 							{this.props.isAdmin?<span onClick={(event)=>this.stopPro(event)} className={this.props.isAdminOrCreator()?"homepagePostSetting homepagePostSettingname":"homepagePostSetting homepagePostSettingbox"} style={{"right":"-2px","top":"6px","display":"block"}}>
-								<Link className="btn colorblue font-16 fontweight400" to={"/shixuns/"+discussMessage.shixun_identifier+"/challenges"} target={"_blank"}>实训详情</Link>
+                {discussMessage&&discussMessage.shixun_status>1?<Link className="btn colorblue font-16 fontweight400" to={"/shixuns/"+discussMessage.shixun_identifier+"/challenges"} target={"_blank"}>实训详情</Link>:""}
 								{this.props.isAdminOrCreator()?<a onClick={(event)=>this.editname(discussMessage.name,discussMessage.homework_id,event)} className={"btn colorblue ml20 font-16 fontweight400"}>重命名</a>:""}
 								{/*<WordsBtn className="btn colorblue ml20 font-16"  to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/settings?tab=3`}  > 设置</WordsBtn>*/}
 								<WordsBtn className="btn colorblue  font-16 ml15 fontweight400"  to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/settings?tab=3`}  > 设置</WordsBtn>
 							</span>:""}
 
 
-							{this.props.isStudent===true?this.props.course_identity===5?
+							{this.props.isStudent===true?this.props.course_identity===5?discussMessage&&discussMessage.shixun_status>1?
 								<WordsBtn  style="blue" className="colorblue font-16 mr20 fr mt10">
 									{startbtn===false?
 										(discussMessage.task_operation[0] == '继续挑战' || discussMessage.task_operation[0] == '查看实战' ?
@@ -377,7 +377,7 @@ class ShixunhomeWorkItem extends Component{
 											<a className="btn colorblue" onClick={()=>this.taskoperationId(discussMessage.task_operation[1])}>
 												{discussMessage.task_operation[0]}
 											</a>):<a className="btn colorblue" >开启中</a>}
-								</WordsBtn>:"":""
+								</WordsBtn>:"":"":""
 							}
 
             </h6>

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

@@ -106,8 +106,8 @@ export default class Shixuninformation extends Component {
           test_set_permission: this.state.test_set_permission,
           vnc: this.state.vnc,
           webssh: this.state.websshshow === false ? 0 : this.state.opensshRadio,
+          code_edit_permission:this.state.is_secret_repository
         },
-        is_secret_repository: this.state.is_secret_repository
       }
     ).then((response) => {
       if (response.data.status === -1) {