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

app/decorators/tiding_decorator.rb

@@ -344,7 +344,7 @@ module TidingDecorator
   end
 
   def resubmit_student_work_content
-    I18n.t(locale_format) % container&.homework_common.try(:name)
+    I18n.t(locale_format) % parent_container.try(:name)
   end
 
   def student_works_score_content

app/services/subject_search_service.rb

@@ -12,7 +12,7 @@ class SubjectSearchService < ApplicationService
     type = params[:type] || "all"
 
     if type == "mine"
-      @subjects = User.current.shixuns.visible.unhidden
+      @subjects = User.current.subjects.visible.unhidden
     else
       @subjects = Subject.visible.unhidden
     end

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

@@ -488,12 +488,26 @@ class MessagSub extends Component {
 			case "SubjectStartCourse":
 				return window.open(`/paths/${item.container_id}`);
 			case "ResubmitStudentWork":
-				return window.open(`/courses/${item.belong_container_id}/graduation_tasks/${item.container_id}/appraise`);
+				if (item.homework_type === "normal") {
+					//普通作业
+					return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/${item.container_id}/appraise`);
+				}
+				if (item.homework_type === "group") {
+					//分组作业
+					return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/${item.container_id}/appraise`);
+				}
 			case "AdjustScore":
 				//belong_container_id course的id
-				return window.open(`/courses/${item.belong_container_id}/graduation_tasks/${item.parent_container_id}`);
+				if (item.homework_type === "normal") {
+					//普通作业
+					return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}`);
+				}
+				if (item.homework_type === "group") {
+					//分组作业
+					return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}`);
+				}
 			default :
-				return window.open("/")
+				return
 		}
 
 	}
@@ -575,7 +589,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