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

Merge branch 'v1.4' of https://github.com/metersphere/metersphere into v1.4

This commit is contained in:
chenjianxing 2020-10-26 10:02:04 +08:00
parent a0b2dbb53e 578cd10143
commit a7a2f495d6
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/io/metersphere/track/service/TestPlanService.java
View File

@ -542,10 +542,14 @@ public class TestPlanService {
String eTime = String.valueOf(endTime); String eTime = String.valueOf(endTime);
if (!sTime.equals("null")) { if (!sTime.equals("null")) {
start = sdf.format(new Date(Long.parseLong(sTime))); start = sdf.format(new Date(Long.parseLong(sTime)));
} else {
start = "";
} }
String end = null; String end = null;
if (!eTime.equals("null")) { if (!eTime.equals("null")) {
end = sdf.format(new Date(Long.parseLong(eTime))); end = sdf.format(new Date(Long.parseLong(eTime)));
} else {
end = "";
} }
String context = ""; String context = "";
if (StringUtils.equals(NoticeConstants.CREATE, type)) { if (StringUtils.equals(NoticeConstants.CREATE, type)) {

12
frontend/src/business/components/settings/organization/TaskNotification.vue
View File

@ -45,8 +45,7 @@
<el-table-column :label="$t('schedule.receiver')" prop="userIds" min-width="20%"> <el-table-column :label="$t('schedule.receiver')" prop="userIds" min-width="20%">
<template v-slot:default="{row}"> <template v-slot:default="{row}">
<el-select v-model="row.userIds" filterable multiple <el-select v-model="row.userIds" filterable multiple
:placeholder="$t('commons.please_select')" :placeholder="$t('commons.please_select')" style="width: 100%;" :disabled="!row.isSet">
@click.native="userList()" style="width: 100%;" :disabled="!row.isSet">
<el-option <el-option
v-for="item in jenkinsReceiverOptions" v-for="item in jenkinsReceiverOptions"
:key="item.id" :key="item.id"
@ -144,8 +143,7 @@
<el-table-column :label="$t('schedule.receiver')" prop="userIds" min-width="20%"> <el-table-column :label="$t('schedule.receiver')" prop="userIds" min-width="20%">
<template v-slot:default="{row}"> <template v-slot:default="{row}">
<el-select v-model="row.userIds" filterable multiple <el-select v-model="row.userIds" filterable multiple
:placeholder="$t('commons.please_select')" :placeholder="$t('commons.please_select')" style="width: 100%;" :disabled="!row.isSet">
@click.native="testPlanUserList()" style="width: 100%;" :disabled="!row.isSet">
<el-option <el-option
v-for="item in row.testPlanReceiverOptions" v-for="item in row.testPlanReceiverOptions"
:key="item.id" :key="item.id"
@ -241,7 +239,7 @@
<template v-slot:default="{row}"> <template v-slot:default="{row}">
<el-select v-model="row.userIds" filterable multiple <el-select v-model="row.userIds" filterable multiple
:placeholder="$t('commons.please_select')" :placeholder="$t('commons.please_select')"
@click.native="reviewUerList()" style="width: 100%;" :disabled="!row.isSet"> style="width: 100%;" :disabled="!row.isSet">
<el-option <el-option
v-for="item in row.reviewReceiverOptions" v-for="item in row.reviewReceiverOptions"
:key="item.id" :key="item.id"
@ -336,7 +334,7 @@
<template v-slot:default="{row}"> <template v-slot:default="{row}">
<el-select v-model="row.userIds" filterable multiple <el-select v-model="row.userIds" filterable multiple
:placeholder="$t('commons.please_select')" :placeholder="$t('commons.please_select')"
@click.native="defectUserList()" style="width: 100%;" :disabled="!row.isSet"> style="width: 100%;" :disabled="!row.isSet">
<el-option <el-option
v-for="item in defectReceiverOptions" v-for="item in defectReceiverOptions"
:key="item.id" :key="item.id"
@ -553,7 +551,7 @@ export default {
if (data.event && data.userIds.length > 0 && data.type) { if (data.event && data.userIds.length > 0 && data.type) {
console.log(data.type) console.log(data.type)
if (data.type === 'NAIL_ROBOT' || data.type === 'NAIL_ROBOT') { if (data.type === 'NAIL_ROBOT' || data.type === 'WECHAT_ROBOT') {
if (!data.webhook) { if (!data.webhook) {
this.$warning(this.$t('organization.message.message_webhook')); this.$warning(this.$t('organization.message.message_webhook'));
} else { } else {