Merge branches 'dev_Ysm' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into develop

app/views/tidings/_tiding.json.jbuilder

@@ -4,7 +4,15 @@ json.content tiding.content
 
 json.identifier tiding.identifier
 json.auth_type tiding.container_type == 'ApplyUserAuthentication' ? tiding.container.auth_type : nil
-json.homework_type tiding.container_type == 'HomeworkCommon' ? tiding.container.homework_type : nil
+
+homework_type = nil
+if tiding.container_type == 'HomeworkCommon'
+  homework_type = tiding.container.homework_type rescue nil
+end
+if homework_type.blank? && tiding.parent_container_type == 'HomeworkCommon'
+  homework_type = tiding.parent_container.homework_type rescue nil
+end
+json.homework_type homework_type
 
 json.time tiding.how_long_time
 json.new_tiding tiding.unread?(@onclick_time)

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

@@ -214,16 +214,17 @@ class MessagSub extends Component{
 					 	//学生作业页 homework = parent_container_id
 						 if(item.homework_type==="normal"){
 							 //普通作业
-							 return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`)
+							 return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/question`)
 						 }
 						 if(item.homework_type==="group"){
 							 //分组作业
-							 return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`)
+							 return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/question`)
 						 }
 						 if(item.homework_type==="practice"){
 							 //实训作业
-							 return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`)
+							 return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/`)
 						 }
+						 return "";
 					 case "GraduationTopic" :
 					 	// 毕业目标页 parent_container_id
 						 return window.open(`/courses/${item.belong_container_id}/graduation_topics/${item.parent_container_id}/detail`)
@@ -231,16 +232,17 @@ class MessagSub extends Component{
 					 	//学生作业页
 						 if(item.homework_type==="normal"){
 							 //普通作业
-							 return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`)
+							 return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/question`)
 						 }
 						 if(item.homework_type==="group"){
 							 //分组作业
-							 return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`)
+							 return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/question`)
 						 }
 						 if(item.homework_type==="practice"){
 							 //实训作业
-							 return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`)
+							 return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/`)
 						 }
+						 return "";
 				 }
 			case "Memo" :
 				// 交流问答页 :id = parent_container_id
@@ -500,6 +502,11 @@ class MessagSub extends Component{
 							   	   if(item.parent_container_type==="Principal"){
 											 boolps=false;
 										 }
+							   	   if(item.parent_container_type==="HomeworkCommon"){
+							   	   if(item.homework_type===null||item.homework_type===undefined){
+											 boolps=false;
+										 }
+										 }
 								 }
 							   // if(item.container_type==="HomeworkCommon"){
 							   // 	  if(item.parent_container_type==="AnonymousAppeal"){

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

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