test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: --bug=1007080 --user=刘瑞斌 【github#6630】不配置通知模板时，发送的消息内容和默认模板不一致 https://www.tapd.cn/55049933/s/1054317

This commit is contained in:
Captain.B 2021-10-11 10:23:53 +08:00 committed by 刘瑞斌
parent 46905850f8
commit 8595e2f6f3
4 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/src/main/java/io/metersphere/track/service/IssuesService.java
View File

@ -300,14 +300,6 @@ public class IssuesService {
return issuesMapper.selectByPrimaryKey(id);
}
private static String getIssuesContext(SessionUser user, IssuesUpdateRequest issuesRequest, String type) {
String context = "";
if (StringUtils.equals(NoticeConstants.Event.CREATE, type)) {
context = "缺陷任务通知：" + user.getName() + "发起了一个缺陷" + "'" + issuesRequest.getTitle() + "'" + "请跟进";
}
return context;
}
public List<ZentaoBuild> getZentaoBuilds(IssuesRequest request) {
ZentaoPlatform platform = (ZentaoPlatform) IssueFactory.createPlatform(IssuesManagePlatform.Zentao.name(), request);
return platform.getBuilds();

2
frontend/src/business/components/settings/organization/components/api/ApiHomeNotification.vue
View File

@ -180,7 +180,7 @@ export default {
"</div>\n" +
"</body>\n" +
"</html>",
robotTitle: "${operator}发起了一个缺陷:${issuesName}，请跟进",
robotTitle: "${operator}创建了缺陷:${issuesName}",
defectTask: [{
taskType: "defectTask",
event: "",

4
frontend/src/business/components/settings/organization/components/track/DefectTaskNotification.vue
View File

@ -176,11 +176,11 @@ export default {
"</head>\n" +
"<body>\n" +
"<div>\n" +
" <p>${operator}发起了一个缺陷:${name}</p>\n" +
" <p>${operator}创建了缺陷:${name}</p>\n" +
"</div>\n" +
"</body>\n" +
"</html>",
robotTitle: "${operator}发起了一个缺陷:${name}",
robotTitle: "${operator}创建了缺陷:${name}",
defectTask: [{
taskType: "defectTask",
event: "",

2
frontend/src/business/components/xpack

@ -1 +1 @@
Subproject commit 71e705f48da10eb37135b189582ca0c917a2ffb3
Subproject commit 68e291c7626aa1250303104f6c39d9646a1339e5