Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/educoder into develop

public/react/src/modules/paths/PathDetail/Addshixuns.js

@@ -30,8 +30,22 @@ class Addshixuns extends Component {
 		this.props.modalCancel()
 	}
 
+	//判断是否为空
+	getshixunname( str ){
+		if ( str == "" ) return true;
+		var regu = "^[ ]+$";
+		var re = new RegExp(regu);
+		return re.test(str);
+	}
+
 	modalSave=()=>{
 		let {shixunname}=this.state;
+    if(this.getshixunname(shixunname)===true){
+			this.setState({
+				shixunzero:true
+			})
+			return
+		}
 		if(shixunname===undefined||shixunname.length===0){
 			this.setState({
 				shixunzero:true

public/react/src/modules/paths/PathDetail/DetailCards.js

@@ -471,8 +471,36 @@ class DetailCards extends Component{
 
                         <div>
 
-                          {
-                            item.shixuns_list && item.shixuns_list.map((line,index)=>{
+													{this.props.current_user&&this.props.current_user.admin===true||this.props.current_user&&this.props.current_user.business===true?
+														item.shixuns_list && item.shixuns_list.map((line,index)=>{
+														return(
+															<div className="clearfix paragraph lineh-30" onMouseEnter={()=>this.showparagraph(key,index)} onMouseLeave={this.hideparagraph}>
+
+																<li className="fl li-width63">
+
+                                      <span className="progressRing mr10">
+                                      {
+																				line.complete_status === 1 ?<i className="iconfont icon-wancheng progressRing-over font-18 mt10"></i>
+																					:<i className="iconfont icon-bofang progressRing-part font-18 mt10"></i>
+																			}
+                                      </span>
+																	<span className={"paragraph_name color-grey3"}>
+                                        <span className="subject_stage_shixun_index">{key+1}</span>-{index+1}&nbsp;&nbsp;{line.shixun_name}
+                                      </span>
+
+																</li>
+
+
+																<li className={showparagraph===false?"none":"fr status_li"}>
+																	{
+																		showparagraphkey===key&&showparagraphindex===index?<div>
+																			<Link to={'/shixuns/'+line.identifier+'/challenges'} className="mr30 color-blue_4C shixun_detail pointer fl" target="_blank">查看详情</Link>
+																		</div>:""
+																	}
+																</li>
+
+															</div>)
+													}):item.shixuns_list && item.shixuns_list.map((line,index)=>{
                               return(
                                 <div className="clearfix paragraph lineh-30" onMouseEnter={()=>this.showparagraph(key,index)} onMouseLeave={this.hideparagraph}>