diff --git a/app/controllers/users/private_messages_controller.rb b/app/controllers/users/private_messages_controller.rb index b80b6152b..3a5635ef7 100644 --- a/app/controllers/users/private_messages_controller.rb +++ b/app/controllers/users/private_messages_controller.rb @@ -9,6 +9,8 @@ class Users::PrivateMessagesController < Users::BaseController query = "SELECT subquery.*, COUNT(*) message_count FROM (#{subquery}) subquery "\ "GROUP BY subquery.target_id ORDER BY subquery.send_time desc LIMIT #{limit_value} OFFSET #{offset_value}" @messages = PrivateMessage.select('*').from("(#{query}) AS query").includes(target: :user_extension) + + observed_user.private_messages.only_unread.update_all(status: 1) end def create diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js index 8b4c7d30d..12a922ea9 100644 --- a/public/react/src/modules/message/js/MessagSub.js +++ b/public/react/src/modules/message/js/MessagSub.js @@ -183,10 +183,16 @@ class MessagSub extends Component{ } case 'JoinCourse' : // 课堂详情页 :id = - return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`) + return window.open(`/courses/${item.belong_container_id}/teachers`) case 'StudentJoinCourse': // 课堂详情页 :id = container_id - return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`) + if(item.tiding_type === 'Apply') { + return window.open(`/courses/${item.belong_container_id}/teachers`); + } + if(item.tiding_type === 'System'){ + //教学案例详情 :id = container_id + return window.open(`/courses/${item.belong_container_id}/students`); + } case 'DealCourse': // 课堂详情页 :id = container_id return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`) @@ -195,6 +201,10 @@ class MessagSub extends Component{ return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`) case 'Course' : // 课堂详情页 :id = container_id + if(item.tiding_type==="Delete"){ + + return; + } return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`) case 'ArchiveCourse' : // 课堂详情页 :id = container_id @@ -222,7 +232,7 @@ class MessagSub extends Component{ } if(item.homework_type==="practice"){ //实训作业 - return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/`) + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=1`) } return ""; case "GraduationTopic" : @@ -240,7 +250,7 @@ class MessagSub extends Component{ } if(item.homework_type==="practice"){ //实训作业 - return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/`) + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=1`) } return ""; } @@ -283,10 +293,12 @@ class MessagSub extends Component{ switch (item.parent_container_type) { case "CommitExercise": // 课堂-学生试卷详情 :id = container_id :user_id = trigger_user.id - return window.open(` /courses/${item.belong_container_id}/exercises/${item.container_id}/student_exercise_list?tab=0`) + return window.open(` /courses/${item.belong_container_id}/exercises/${item.container_id}/student_exercise_list?tab=0`); + //记得跳评阅页面 case "ExerciseScore": // 课堂-学生试卷详情 :id = container_id :user_id = trigger_user.id - return window.open(` /courses/${item.belong_container_id}/exercises/${item.container_id}/student_exercise_list?tab=0`) + return window.open(` /courses/${item.belong_container_id}/exercises/${item.container_id}/student_exercise_list?tab=0`); + //记得跳评阅页面 default : // 课堂-试卷列表详情 :id = container_id return window.open(`/courses/${item.belong_container_id}/exercises/${item.container_id}`) @@ -367,15 +379,15 @@ class MessagSub extends Component{ //课堂-作业 :id = container_id if(item.homework_type==="normal"){ //普通作业 - return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.container_id}/list`) + 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.container_id}/list`) + //分组作业/courses/1208/group_homeworks/22373/1219130/appraise + return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/${item.container_id}/appraise`) } if(item.homework_type==="practice"){ //实训作业 - return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}/list?tab=0`) + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`) } case "StudentWorksScore" : //课堂-作业 :id = parent_container_id @@ -414,7 +426,7 @@ class MessagSub extends Component{ return window.open(`/managements/mirror_repository`) case "Journal" : //项目Issue页 :id = parent_container_id - return window.open(`/projects/${item.parent_container_id}/issues?remote=true`) + return window.open(`/issues/${item.parent_container_id}`); case "Issue" : //项目Issue页 :id = container_id return window.open(`/issues/${item.container_id}`) @@ -518,6 +530,12 @@ class MessagSub extends Component{ boolps=false; } } + if(item.container_type==="Course"){ + if(item.tiding_type==="Delete"){ + boolps=false; + } + } + return(
this.gettourl(item)}> @@ -544,7 +562,7 @@ class MessagSub extends Component{ ` } -

+