From a47fd91b8eaae8b3e9e8ac4862ccfce991c1590b Mon Sep 17 00:00:00 2001
From: p31729568 <winse.wang@foxmail.com>
Date: Fri, 2 Aug 2019 21:53:58 +0800
Subject: [PATCH 1/6] fix
---
app/views/tidings/_tiding.json.jbuilder | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/app/views/tidings/_tiding.json.jbuilder b/app/views/tidings/_tiding.json.jbuilder
index c00670433..460f7c403 100644
--- a/app/views/tidings/_tiding.json.jbuilder
+++ b/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
+ if homework_type.blank?
+ homework_type = tiding.parent_container.homework_type rescue nil
+ end
+end
+json.homework_type homework_type
json.time tiding.how_long_time
json.new_tiding tiding.unread?(@onclick_time)
From 62246ca7ce5a80239bd359f57563dfcaec3d1526 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 2 Aug 2019 21:57:50 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/src/modules/message/js/MessagSub.js | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js
index 72a7e373e..1a543914d 100644
--- a/public/react/src/modules/message/js/MessagSub.js
+++ b/public/react/src/modules/message/js/MessagSub.js
@@ -224,6 +224,7 @@ class MessagSub extends Component{
//实训作业
return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`)
}
+ return "";
case "GraduationTopic" :
// 毕业目标页 parent_container_id
return window.open(`/courses/${item.belong_container_id}/graduation_topics/${item.parent_container_id}/detail`)
@@ -241,6 +242,7 @@ class MessagSub extends Component{
//实训作业
return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`)
}
+ 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"){
From a232108d6dd9c49fdaec7d298975a8061b92a0a0 Mon Sep 17 00:00:00 2001
From: p31729568 <winse.wang@foxmail.com>
Date: Fri, 2 Aug 2019 21:57:51 +0800
Subject: [PATCH 3/6] fix
---
app/views/tidings/_tiding.json.jbuilder | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/views/tidings/_tiding.json.jbuilder b/app/views/tidings/_tiding.json.jbuilder
index 460f7c403..207d4b137 100644
--- a/app/views/tidings/_tiding.json.jbuilder
+++ b/app/views/tidings/_tiding.json.jbuilder
@@ -8,9 +8,9 @@ json.auth_type tiding.container_type == 'ApplyUserAuthentication' ? tiding.conta
homework_type = nil
if tiding.container_type == 'HomeworkCommon'
homework_type = tiding.container.homework_type rescue nil
- if homework_type.blank?
- homework_type = tiding.parent_container.homework_type rescue nil
- end
+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
From 46290b80eccee632b34afc5aa426c30c194c7490 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 2 Aug 2019 22:05:21 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/src/modules/message/js/MessagSub.js | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js
index 1a543914d..632a99f3e 100644
--- a/public/react/src/modules/message/js/MessagSub.js
+++ b/public/react/src/modules/message/js/MessagSub.js
@@ -214,15 +214,15 @@ 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}/openlist?tab=1`)
}
return "";
case "GraduationTopic" :
@@ -232,15 +232,15 @@ 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}/openlist?tab=1`)
}
return "";
}
From 64fd381f0abff41e8d352b1625bdc7c8c85efc6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 2 Aug 2019 22:07:13 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/modules/tpm/TPMsettings/TPMsettings.js | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/public/react/src/modules/tpm/TPMsettings/TPMsettings.js b/public/react/src/modules/tpm/TPMsettings/TPMsettings.js
index 6550888f6..910ea5882 100644
--- a/public/react/src/modules/tpm/TPMsettings/TPMsettings.js
+++ b/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}
From 9b298eaed5e6747d0d63d90e20bb3813539fc58b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 2 Aug 2019 22:08:38 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/src/modules/message/js/MessagSub.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js
index 632a99f3e..8b4c7d30d 100644
--- a/public/react/src/modules/message/js/MessagSub.js
+++ b/public/react/src/modules/message/js/MessagSub.js
@@ -222,7 +222,7 @@ class MessagSub extends Component{
}
if(item.homework_type==="practice"){
//实训作业
- return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/openlist?tab=1`)
+ return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/`)
}
return "";
case "GraduationTopic" :
@@ -240,7 +240,7 @@ class MessagSub extends Component{
}
if(item.homework_type==="practice"){
//实训作业
- return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/openlist?tab=1`)
+ return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/`)
}
return "";
}