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

app/controllers/exercise_answers_controller.rb

@@ -110,7 +110,7 @@ class ExerciseAnswersController < ApplicationController
     elsif @exercise_user.commit_status == 1
       normal_status(-1,"已提交/已结束的试卷不允许修改！")
     else
-      if (@exercise_user_status == Exercise::DEADLINE && @exercise_user.commit_status == 0) || (@exercise.time > 0 && @exercise_user.start_at.present? && ((@exercise_user.start_at + (@exercise.time.to_i + 1).minutes) < Time.now))
+      if (@exercise_user_status == Exercise::DEADLINE && @exercise_user.commit_status == 0) || (@exercise.time > 0 && @exercise_user.start_at.present? && ((@exercise_user.start_at + @exercise.time.to_i.minutes) < Time.now))
         objective_score = calculate_student_score(@exercise,current_user)[:total_score]
         subjective_score = @exercise_user.subjective_score < 0.0 ? 0.0 : @exercise_user.subjective_score
         total_score = objective_score + subjective_score

app/controllers/exercises_controller.rb

@@ -783,7 +783,7 @@ class ExercisesController < ApplicationController
 
   # 首页批量或单独 立即截止，截止时间为当前时间
   def end_exercise
-    sleep(1)
+
     ActiveRecord::Base.transaction do
       begin
         check_ids = Exercise.where(id:params[:check_ids])

public/react/src/modules/courses/coursesPublic/NewShixunModel.js

@@ -536,7 +536,7 @@ class NewShixunModel extends Component{
 													className="fl task-hide edu-txt-left mt3"
 													name="shixun_homework[]"
 												></Checkbox>
-												<a target="_blank" href={`/shixuns/${item.identifier}/challenges`} className="ml15 fl font-16  color-dark maxwidth1100"
+												<a target="_blank" href={this.props.type==='shixuns'?`/shixuns/${item.identifier}/challenges`:`/paths/${item.id}`} className="ml15 fl font-16  color-dark maxwidth1100"
 													 dangerouslySetInnerHTML={{__html: item.title}}
 												>
 												</a>
@@ -588,13 +588,19 @@ class NewShixunModel extends Component{
 														}
 													`}
 													</style>
-													<Breadcrumb separator="|">
+													{this.props.type==='shixuns'?<Breadcrumb separator="|">
 														<Breadcrumb.Item>{item.author_name}</Breadcrumb.Item>
 														<Breadcrumb.Item>{item.author_school_name}</Breadcrumb.Item>
 														<Breadcrumb.Item>难度系数：{item.level}</Breadcrumb.Item>
 														<Breadcrumb.Item>学习人数：{item.study_count}</Breadcrumb.Item>
-													</Breadcrumb>
-
+													</Breadcrumb>:
+													<Breadcrumb separator="|">
+														<Breadcrumb.Item>{item.author_name}</Breadcrumb.Item>
+														<Breadcrumb.Item>{item.author_school_name}</Breadcrumb.Item>
+														<Breadcrumb.Item>学习人数：{item.myshixuns_count}</Breadcrumb.Item>
+														<Breadcrumb.Item>章节：{item.stage_count}</Breadcrumb.Item>
+														<Breadcrumb.Item>实训：{item.shixuns_count}</Breadcrumb.Item>
+													</Breadcrumb>}
 												</div>
 												{item.subjects===undefined?"":item.subjects.length===0?"":<Dropdown overlay={()=>this.ItsCourse(item.subjects)}>
 													<a className="ant-dropdown-link fl ml30 newshixunfont12  color-blue" >

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

@@ -451,9 +451,9 @@ class GraduationTaskDetail extends Component{
                   </li>:""}
                   {questionslist.work_status===undefined||questionslist.work_status===null||questionslist.work_status.length===0?"":questionslist.work_status.map((item,key)=>{
                     return(
-                      <span key={key} className="fr mt20">
-                          {item==="提交作品"?<a className={"fr color-blue font-16 ml20"} href={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/"+task_Id+"/works/new"}>提交作品</a>:""}
-                          {item==="补交作品"?<a className={"fr color-blue font-16 ml20"} href={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/"+task_Id+"/works/new"}>补交作品</a>:""}
+                      <span key={key} className="fr mt20"> 
+                          {item==="提交作品"?<a className={"fr color-blue font-16 ml20"} href={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/works/"+task_Id+"/new"}>提交作品</a>:""}
+                          {item==="补交作品"?<a className={"fr color-blue font-16 ml20"} href={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/works/"+task_Id+"/new"}>补交作品</a>:""}
                           {item==="修改作品"?<a className={"fr color-blue font-16 ml20"} href={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/works"+"/"+ questionslist.work_id + "/edit"}>修改作品</a>:""}
                           {item==="查看作品"?<a className={"fr color-blue font-16 ml20"} href={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/works"+"/"+ questionslist.work_id + "/edit"}>查看作品</a> :""}
                           {item==="创建项目"?<a className={"fr color-blue font-16 ml20"} href={'/projects/new'} target="_blank">创建项目</a>:""}

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

@@ -493,7 +493,7 @@ class MessagSub extends Component {
 				//belong_container_id course的id
 				return window.open(`/courses/${item.belong_container_id}/graduation_tasks/${item.parent_container_id}`);
 			default :
-				return window.open("/")
+				return
 		}
 
 	}
@@ -575,7 +575,16 @@ class MessagSub extends Component {
 												boolps = false;
 											}
 										}
-
+										if (item.container_type === "DeleteCourse") {
+											if (item.tiding_type === "System") {
+												boolps = false;
+											}
+										}
+										if (item.container_type === "DeleteCourseMember") {
+											if (item.tiding_type === "System") {
+												boolps = false;
+											}
+										}
 										return (
 											<div className="pl25 ridinglist edu-back-white" key={key}>
 												<div