Merge remote-tracking branch 'origin/master'

public/react/src/modules/courses/boards/BoardsListItem.js

@@ -26,6 +26,8 @@ class BoardsListItem extends Component{
     if (!discussMessage || !discussMessage.author) {
       return '';
     }
+    let canNotLink = !isAdminOrStudent && discussMessage.is_public == false
+
     return(
         <div className="panel-inner-fourm boardsList">
           <style>{`
@@ -44,8 +46,9 @@ class BoardsListItem extends Component{
           </a>
           <div className="clearfix ds pr pt5 contentSection" onClick={() => onItemClick(discussMessage)}>
             <h6>
-              <a href="javascript:void(0)" className="panel-list-title hide fl mt5 color-dark font-bd" style={{ fontWeight: 'bold' }}
+              <a href="javascript:void(0)" className="panel-list-title hide fl mt5 color-dark font-bd" 
-                onClick={() => this.onTitleClick(discussMessage)}
+                style={{ fontWeight: 'bold', cursor: (canNotLink ? 'default' : 'poninter') }}
+                onClick={canNotLink ? () => {} : () => this.onTitleClick(discussMessage)}
               >{discussMessage.subject}</a>
               { !!discussMessage.sticky && <span className="btn-cir btn-cir-red fl mt5 ml5">置顶</span> }
               {

public/react/src/modules/courses/busyWork/CommonWorkItem.js

@@ -104,6 +104,7 @@ class CommonWorkItem extends Component{
     let coursesId = this.props.match.params.coursesId;
 
     const isStudent = this.props.isStudent()
+    const isAdmin = this.props.isAdmin()
     const isAdminOrStudent = this.props.isAdminOrStudent()
     return(
       <div className="workList">
@@ -128,19 +129,20 @@ class CommonWorkItem extends Component{
         </style>
       {
         mainList && mainList.homeworks.length>0 && mainList.homeworks.map((item,index)=>{
+          let canNotLink = !isAdminOrStudent && item.private_icon == true
           return(
         <div className="mt20 edu-back-white padding02010" key={index} >
           <div className="clearfix">
             <div className="workList_Item">
               {
-                mainList && mainList.course_identity < 5 &&
+                mainList && isAdmin &&
                 <span className="fl mr12"><Checkbox value={item.homework_id}></Checkbox></span>
               }
               <div className="flex1" onClick={() => this.props.onItemClick(Object.assign({}, item, {id: item.homework_id})) }>
                 <p className="clearfix mb20">
                   <a  title={item.name}
-                      className="fl font-16 font-bd mt2 comnonwidth580"
+                      className="fl font-16 font-bd mt2 comnonwidth580" style={{cursor: canNotLink ? 'normal' : 'poninter'}}
-                      onClick={() => this.onItemClick(item)}
+                      onClick={canNotLink ? () => {} : () => this.onItemClick(item)}
                   >{item.name}</a>
                   
               {/* 只有非课堂成员且作业是私有的情况下才会为true */}
@@ -155,7 +157,7 @@ class CommonWorkItem extends Component{
                     <CoursesListType typelist={item.status} />
                   </span>
                   {
-                    mainList && mainList.course_identity < 5 &&
+                    mainList && isAdmin &&
                     <li className="fr drop_down">
                       <i className="iconfont icon-caidan font-16 color-grey-c"></i>
                       <ul className="drop_down_normal" style={{ textAlign: 'center'}}>

public/react/src/modules/courses/common/titleSearch/TitleSearchSection.js

@@ -62,7 +62,7 @@ class Titlesearchsection extends Component{
           <p className="clearfix padding30 bor-bottom-greyE">
             <p style={{height: '20px'}}>
               <span className="font-18 fl color-dark-21">{title}</span>
-              <li className="fr">
+              <li className="fr font-16">
                 { firstRowRight }
               </li>
             </p>

public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReplyChild.js

@@ -83,7 +83,7 @@ class GraduationTasksappraiseReplyChild extends Component{
             </div> */}
 
 							{this.props.ultimate===true?"": isAdmin && <GraduationTasksappraiseMainEditor {...this.props}
-																																														addSuccess={this.props.addSuccess()}
+								addSuccess={() => this.props.addSuccess()}																																								
 							></GraduationTasksappraiseMainEditor> }
 							<style>{`
 

public/react/src/modules/forums/MemoDetailMDEditor.js

@@ -158,13 +158,15 @@ class MemoDetailMDEditor extends Component {
 						</a>
 					</div>
 					<style>
+						{/* 
+						先注释了，影响到了md的拖拽
 						{
 							`
 							.commentInputs{
    							 height: 250px;
 							}
 							`
-						}
+						} */}
 					</style>
 					<div nhname={`new_message_${memo.id}`} className="commentInput  commentInputs"
 							style={{ padding: '30px',boxSizing:"border-box", display: isInited ? '' : 'none' }} >