Merge branches 'dev_jupyter' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into develop

chromesetting
杨树明 5 years ago
commit d3ef4987e6

@ -183,8 +183,12 @@ class Challengesjupyter extends Component {
render() { render() {
let{ChallengesDataList,booljupyterurls}=this.state; let{ChallengesDataList,booljupyterurls}=this.state;
let id = this.props.match.params.shixunId; let id = this.props.match.params.shixunId;
//老师
const is_teacher = this.props&&this.props.current_user&&this.props.current_user.is_teacher?this.props.current_user.is_teacher:false; const is_teacher = this.props&&this.props.current_user&&this.props.current_user.is_teacher?this.props.current_user.is_teacher:false;
//运营人员
const business = this.props&&this.props.current_user&&this.props.current_user.business?this.props.current_user.business:false;
//管理员
const admin = this.props&&this.props.current_user&&this.props.current_user.admin?this.props.current_user.admin:false;
return ( return (
@ -297,7 +301,7 @@ class Challengesjupyter extends Component {
} }
</style> </style>
{ {
is_teacher===true? is_teacher===true||admin===true||business===true?
<div className="mt35"> <div className="mt35">
<div className="pb47"> <div className="pb47">
{ {

Loading…
Cancel
Save