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

app/controllers/courses_controller.rb

@@ -924,16 +924,23 @@ class CoursesController < ApplicationController
               course_message = CourseMessage.new(course_id: course.id, user_id: course.tea_id, status: 0,
                                                  course_message_id: current_user.id, course_message_type: "JoinCourseRequest",
                                                  viewed: false)
-              course_message.content = 2 if params[:professor].present? && params[:professor].to_i == 1
-              course_message.content = 3 if params[:assistant_professor].present? && params[:assistant_professor].to_i == 1
+              if params[:professor].present? && params[:professor].to_i == 1
+                course_message.content = 2
+                role = 9
+                message = "教师申请已提交，请等待审核"
+              else
+                course_message.content = 3
+                role = 7
+                message = "助教申请已提交，请等待审核"
+              end
 
               course_message.save!
 
-              role = course_message.content == 2 ? '9' : '7' # 7:助教 9:教师
+              # role = course_message.content == 2 ? '9' : '7' # 7:助教 9:教师
               ApplyTeacherRoleJoinCourseNotifyJob.perform_later(current_user.id, course.id, role)
-              message = "#{course_message.content == 2 ? '教师' : '助教'}申请已提交，请等待审核"
+              # message = "#{course_message.content == 2 ? '教师' : '助教'}申请已提交，请等待审核"
             else
-              message = "#{existing_course_message.content == 2 ? '教师' : '助教'}申请已提交，请等待审核"
+              message = "#{existing_course_message.content == '2' ? '教师' : '助教'}申请已提交，请等待审核"
             end
           else
             message = "您已是课堂成员"

app/models/course_message.rb

@@ -11,7 +11,7 @@ class CourseMessage < ApplicationRecord
 
   def pass!
     update!(status: :PASSED)
-    send_deal_tiding
+    send_deal_tiding(1)
   end
 
   def application_user
@@ -20,16 +20,16 @@ class CourseMessage < ApplicationRecord
 
   def reject!
     update!(status: :REJECTED)
-    send_deal_tiding
+    send_deal_tiding(2)
   end
 
   private
 
-  def send_deal_tiding
+  def send_deal_tiding deal_status
     # 发送申请处理结果消息
     Tiding.create!(
       user_id: course_message_id, trigger_user: User.current, container_id: course_id, container_type: 'DealCourse',
-      belong_container: course, extra: content.to_i == 2 ? '7' : '9', tiding_type: 'System', status: status == :PASSED ? 1 : 2
+      belong_container: course, extra: content.to_i == 2 ? '9' : '7', tiding_type: 'System', status: deal_status
     )
     # 将申请消息置为已处理
     Tiding.where(trigger_user_id: user_id, container_id: course_id, container_type: 'JoinCourse', status: 0).update_all(status: 1)

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

@@ -301,7 +301,7 @@ class BoardsNew extends Component{
           `}</style>
           <div className="edu-class-container edu-position courseForm">
             <CBreadcrumb items={[
-              { to: current_user.first_category_url, name: this.props.coursedata ? this.props.coursedata.name : ''},
+              { to: current_user&&current_user.first_category_url, name: this.props.coursedata ? this.props.coursedata.name : ''},
               { to: `/courses/${courseId}/boards/${boardId}`, name: this.state.board_name },
               { name: this.isEdit ? '帖子编辑' : '帖子新建'}
             ]}></CBreadcrumb>

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

@@ -546,7 +546,7 @@ class TopicDetail extends Component {
             }
           `}</style>
           <CBreadcrumb className={'independent'} items={[
-            { to: current_user.first_category_url, name: this.props.coursedata.name},
+            { to: current_user&&current_user.first_category_url, name: this.props.coursedata.name},
             { to: `/courses/${courseId}/boards/${boardId}`, name: memo.board_name },
             { name: '帖子详情'}
           ]}></CBreadcrumb>

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

@@ -223,7 +223,7 @@ class CommonWorkDetailIndex extends Component{
                 }
               `}</style>
               {current_user && <CBreadcrumb items={[
-                { to: current_user.first_category_url , name: course_name},
+                { to: current_user&&current_user.first_category_url , name: course_name},
                 { to: `/courses/${courseId}/${moduleEngName}/${category_id}`, name: category_name },
                 window.location.pathname.indexOf('appraise') == -1 ? { } : { to: `/courses/${courseId}/${moduleEngName}/${workId}/list`, name: '作业详情' },
                 // 1.	与上一条联动，当匿评他人作品时，TA人作品的作者真实姓名切换为“匿名”

public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js

@@ -90,7 +90,7 @@ class WorkDetailPageHeader extends Component{
                 }
               `}</style>
               <CBreadcrumb items={[
-                { to: current_user.first_category_url, name: course_name},
+                { to: current_user&&current_user.first_category_url, name: course_name},
                 { to: `/courses/${courseId}/${moduleEngName}/${category_id}`, name: category_name },
                 window.location.pathname.indexOf('appraise') == -1 ? { } : { to: `/courses/${courseId}/${moduleEngName}/${workId}/list`, name: '作业详情' },
                 // 1.	与上一条联动，当匿评他人作品时，TA人作品的作者真实姓名切换为“匿名”

public/react/src/modules/courses/exercise/ExerciseNew.js

@@ -408,7 +408,7 @@ class ExerciceNew extends Component{
           `}</style>
           <div className="edu-class-container edu-position courseForm">
             { current_user && <CBreadcrumb items={[
-              { to: current_user.first_category_url, name: this.props.coursedata ? this.props.coursedata.name : ''},
+              { to: current_user&&current_user.first_category_url, name: this.props.coursedata ? this.props.coursedata.name : ''},
               { to: `/courses/${courseId}/exercises/${left_banner_id}`, name: '试卷列表' },
               { name: this.isEdit ? '编辑试卷' : '新建试卷'}
             ]}></CBreadcrumb> }

public/react/src/modules/courses/graduation/topics/GraduateTopicDetail.js

@@ -105,7 +105,7 @@ class GraduateTopicDetail extends Component{
       <div className="newMain">
         <div className="educontent mt10 mb50">
           <p className="clearfix mb15 lineh-20">
-            <WordsBtn style="grey" className="fl" to={current_user.first_category_url}>{tableData && tableData.course_name}</WordsBtn>
+            <WordsBtn style="grey" className="fl" to={current_user&&current_user.first_category_url}>{tableData && tableData.course_name}</WordsBtn>
             <span className="color-grey-9 fl ml3 mr3">&gt;</span>
             <WordsBtn style="grey" className="fl" to={`/courses/${tableData.course_id}/graduation_topics/${tableData.graduation_id}`}>{tableData.graduation_name}</WordsBtn>
             <span className="color-grey-9 fl ml3 mr3">&gt;</span>

public/react/src/modules/courses/graduation/topics/GraduateTopicNew.js

@@ -323,7 +323,7 @@ class GraduateTopicNew extends Component{
           `}</style>
           <div className="edu-class-container edu-position courseForm">
             <p className="clearfix mb20 mt10">
-              <WordsBtn style="grey" className="fl" to={current_user.first_category_url}>{course_name}</WordsBtn>
+              <WordsBtn style="grey" className="fl" to={current_user&&current_user.first_category_url}>{course_name}</WordsBtn>
               <span className="color-grey-9 fl ml3 mr3">&gt;</span>
               <WordsBtn style="grey" className="fl" to={`/courses/${coursesId}/graduation_topics/${left_banner_id}`}>{left_banner_name}</WordsBtn>
               <span className="color-grey-9 fl ml3 mr3">&gt;</span>

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

@@ -691,39 +691,42 @@ class MemoDetail extends Component {
           <div className="clearfix">
         		<div id="forum_list" className="forum_table mh650">
     	        	<div className="padding40-30 bor-bottom-greyE">
-                        <div className="font-16 mb5 cdefault clearfix pr pr35">
+                        <div className="font-16 mb5 cdefault clearfix pr pr35" style={{display: 'flex', alignItems: 'center'}}>
                             <span className="noteDetailTitle">{memo.subject}</span>
-                            { memo.sticky && <span className="btn-cir btn-cir-red ml10 mt10">置顶</span>}
+                            { memo.sticky && <span className="btn-cir btn-cir-red ml10 " style={{ height: '20px' }}>置顶</span>}
                             { !!memo.reward && <span className="color-orange font-14 ml15"
                               data-tip-down={`获得平台奖励金币：${memo.reward}`} >
                               <i className="iconfont icon-gift mr5"></i>{memo.reward}
                             </span> }
-                            { _current_user && (_current_user.admin === true || _current_user.user_id === author_info.user_id) &&
-                                <div className="edu-position-hidebox" style={{position: 'absolute', right: '12px',top:'4px'}}>
-                                    <a href="javascript:void(0);"><i className="fa fa-bars font-16"></i></a>
-                                    <ul className="edu-position-hide undis">
-                                  { _current_user.admin === true &&
-                                      ( memo.sticky === true ?
-                                          <li><a href="javascript:void(0);" onClick={() => this.setTop(memo)}>取消置顶</a></li>
-                                          :
-                                          <li><a href="javascript:void(0);" onClick={() => this.setTop(memo)}>置&nbsp;&nbsp;顶</a></li> )
-                                      }
-                                        <li><Link to={`/forums/${memo.id}/edit`}>编&nbsp;&nbsp;辑</Link></li>
-                                        <li>
-                                            <a href="javascript:void(0)" onClick={() =>
-                                                window.delete_confirm_box_2_react(`onMemoDelete`, '您确定要删除吗？' , memo)}>
-
-                                            删&nbsp;&nbsp;除</a>
-                                        </li>
-                                    </ul>
-                                </div>
-                            }
-                            <Link className={`task-hide fr return_btn color-grey-6 mt2 ${ _current_user && (_current_user.admin === true 
-                                || _current_user.user_id === author_info.user_id) ? '': 'no_mr'} `} to="/forums" 
-                                style={{ marginRight: '10px'}}
-                            >
-                              返回
-                            </Link>
+
+                            <div style={{ flex: 1 }}>
+                              { _current_user && (_current_user.admin === true || _current_user.user_id === author_info.user_id) &&
+                                  <div className="edu-position-hidebox" style={{position: 'absolute', right: '12px',top:'4px'}}>
+                                      <a href="javascript:void(0);"><i className="fa fa-bars font-16"></i></a>
+                                      <ul className="edu-position-hide undis">
+                                    { _current_user.admin === true &&
+                                        ( memo.sticky === true ?
+                                            <li><a href="javascript:void(0);" onClick={() => this.setTop(memo)}>取消置顶</a></li>
+                                            :
+                                            <li><a href="javascript:void(0);" onClick={() => this.setTop(memo)}>置&nbsp;&nbsp;顶</a></li> )
+                                        }
+                                          <li><Link to={`/forums/${memo.id}/edit`}>编&nbsp;&nbsp;辑</Link></li>
+                                          <li>
+                                              <a href="javascript:void(0)" onClick={() =>
+                                                  window.delete_confirm_box_2_react(`onMemoDelete`, '您确定要删除吗？' , memo)}>
+
+                                              删&nbsp;&nbsp;除</a>
+                                          </li>
+                                      </ul>
+                                  </div>
+                              }
+                              <Link className={`task-hide fr return_btn color-grey-6 mt2 ${ _current_user && (_current_user.admin === true 
+                                  || _current_user.user_id === author_info.user_id) ? '': 'no_mr'} `} to="/forums" 
+                                  style={{ marginRight: '10px'}}
+                              >
+                                返回
+                              </Link>
+                            </div>
                         </div>
                         <div className="color-grey-9 clearfix">
                             <span className="fl">{moment(memo.time).fromNow()} 发布</span>
@@ -804,7 +807,7 @@ class MemoDetail extends Component {
 
                       ></Comments>
                       { hasMoreComments ? 
-                        <div className="memoMore">
+                        <div className="memoMore" style={{ cursor: 'default' }}>
                           <a onClick={this.moreMemos}>查看更多评论</a>
                           <div className="writeCommentBtn" onClick={this.showCommentInput}>写评论</div>
                         </div> 

public/react/src/modules/forums/Post.css

@@ -27,7 +27,7 @@
 	    cursor: pointer;
 	}
 	#forum_list .return_btn.no_mr {
-		margin-right: -16px;
+		margin-right: -24px !important;
 	}
 	div#forum_list>div {
 	    background: #fff;

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

@@ -126,7 +126,7 @@ return function wrap(WrappedComponent) {
 	      	}
 	      	const orderTypeMap = {
 	      		'hottest': 'replies_count',
-	      		'newest': 'updated_at', // 'created_at',
+	      		'newest': 'created_at', // 'created_at',
 	      	}
 	      	const _search = this.props.history.location.search;
 		    const parsed = queryString.parse(_search);

public/react/src/modules/message/js/MessagSub.js

@@ -495,10 +495,10 @@ class MessagSub extends Component{
 			 <div className="bor-top-greyE mycenter">
 				 {/*这里可以进行数据处理*/}
 				 <div className="myw100baifenbi">
-				 <Spin size="large" className="myw100baifenbi" spinning={isSpin}>
+				 <Spin size="large" className="myw100baifenbi mt10" spinning={isSpin}>
 
 					 {
-						 data===undefined?
+						 data===undefined?"":data.length===0?
 							 <div className="edu-tab-con-box clearfix edu-txt-center">
 								 <img className="edu-nodata-img mb20"  src={getImageUrl("images/educoder/nodata.png")}/>
 								 <p className="edu-nodata-p mb20">暂无数据哦~</p>
@@ -562,7 +562,7 @@ class MessagSub extends Component{
 													 	`
 													 }
 												 </style>
-												 <p className="color-grey-6 break_word_firefox yslspansk markdown-body mt3" style={{wordBreak: "break-word"}} dangerouslySetInnerHTML={{__html: markdownToHTML(item.content).replace(/▁/g, "▁▁▁")}} ></p>
+												 <p className="color-grey-6 break_word_firefox yslspansk markdown-body mt10" style={{wordBreak: "break-word"}} dangerouslySetInnerHTML={{__html: markdownToHTML(item.content).replace(/▁/g, "▁▁▁")}} ></p>
 											 </div>
 
 											 <span className={item.new_tiding===true?"new-point fr mr40 mt22":""}></span>

public/react/src/modules/message/js/MessagePrivate.js

@@ -160,14 +160,13 @@ class MessagePrivate extends Component{
 			<Spin size="large" className="myw100baifenbi" spinning={isSpin}>
 
 					{
-						data===undefined?
+						data===undefined?"":data.length===0?
 							<div className="edu-tab-con-box clearfix edu-txt-center">
 								<img className="edu-nodata-img mb20"  src={getImageUrl("images/educoder/nodata.png")}/>
 								<p className="edu-nodata-p mb20">暂无数据哦~</p>
 							</div>
 							:data.map((item,key)=>{
 								return(
-
 										<div className="private-item clearfix df" key={key} onClick={()=>this.smyJump(3,item.target.id)}>
 											<a className="fl mr10 private_message_a" onMouseDown={()=>this.myCome(item)}>
 												<img onMouseDown={()=>this.myCome(item)} src={getImageUrl("images/"+item.target.image_url)} className="radius myimgw48 myimgh48"/>
@@ -179,12 +178,11 @@ class MessagePrivate extends Component{
 													<span className="color-grey-c mr20">[{item.message_count}{"条"}]</span>
 													<span className="color-grey-c">{moment(item.send_time).fromNow()}</span>
 												</p>
-												<span className="color-grey-6 break_word_firefox  markdown-body" 	dangerouslySetInnerHTML={{__html: markdownToHTML(item.content).replace(/▁/g, "▁▁▁")}}	></span>
+												<div className="color-grey-6 break_word_firefox  markdown-body mt10" 	dangerouslySetInnerHTML={{__html: markdownToHTML(item.content).replace(/▁/g, "▁▁▁")}}	></div>
 
 											</div>
 											{item.unread === true ?<span className="new-point fr mt22"></span>:""}
 										</div>
-
 								)
 							})}
 				</Spin>

public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js

@@ -409,7 +409,7 @@ class PackageIndexNEITaskDetails extends Component {
 												return(
 													<div className="ysldivhomediv1s homehove" key={key}>
 														{item.status==="bidding_won"?<img src={gouxuan} className="yslgouxuanimg"/>:""}
-														<a href={`/users/${item.login}`}><img className="div1imgs" src={getImageUrl("images/"+item.image_url)}/></a>
+														<a className={item.status==="bidding_won"?"":"mt20"} href={`/users/${item.login}`}><img className="div1imgs" src={getImageUrl("images/"+item.image_url)}/></a>
 														<div className="textall mt10" title={item.name}> <p className="ptext">{item.name}</p></div>
 														{this.props.current_user&&this.props.current_user.login!=item.login?<a className="ContacttheTAs fl none" target="_blank" href={`/messages/${this.props.current_user&&this.props.current_user.login}/message_detail?target_ids=${item.id}`}>
 															<img alt="头像" className="mr5" src={require('./newstwo.png')}/>联系TA

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

@@ -1391,13 +1391,13 @@ export default class TPMsettings extends Component {
 											})
 										}
 									</Select>
-									<p
-										className="edu-txt-left font-12"
-										style={{display:operateauthority?"block":'none'}}
-									>
-										列表中没有？
-										<a className="color-blue" onClick={this.post_apply}>申请新建</a>
-									</p>
+									{/*<p*/}
+										{/*className="edu-txt-left font-12"*/}
+										{/*style={{display:operateauthority?"block":'none'}}*/}
+									{/*>*/}
+										{/*列表中没有？*/}
+										{/*<a className="color-blue" onClick={this.post_apply}>申请新建</a>*/}
+									{/*</p>*/}
 
 									<Modal
 										keyboard={false}