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

fix(消息通知): 配置消息通知时查询备选人是项目范围

This commit is contained in:
CaptainB 2022-03-17 13:08:46 +08:00 committed by 刘瑞斌
parent 3139054866
commit 9033f2c25b
6 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/business/components/api/automation/schedule/ScheduleMaintain.vue
View File

@ -185,7 +185,7 @@ export default {
}); });
}, },
initUserList() { initUserList() {
this.result = this.$get('user/ws/member/list/' + getCurrentWorkspaceId(), response => { this.result = this.$post('/user/project/member/list', {projectId: getCurrentProjectID()}, response => {
this.scheduleReceiverOptions = response.data; this.scheduleReceiverOptions = response.data;
}); });

2
frontend/src/business/components/api/definition/components/import/ApiSchedule.vue
View File

@ -248,7 +248,7 @@ export default {
}, },
initUserList() { initUserList() {
this.result = this.$get('user/ws/member/list/' + getCurrentWorkspaceId(), response => { this.result = this.$post('/user/project/member/list', {projectId: getCurrentProjectID()},response => {
this.scheduleReceiverOptions = response.data; this.scheduleReceiverOptions = response.data;
}); });
}, },

10
frontend/src/business/components/common/components/MsScheduleEdit.vue
View File

@ -41,7 +41,13 @@
</template> </template>
<script> <script>
import {getCurrentUser, getCurrentWorkspaceId, listenGoBack, removeGoBackListener} from "@/common/js/utils"; import {
getCurrentProjectID,
getCurrentUser,
getCurrentWorkspaceId,
listenGoBack,
removeGoBackListener
} from "@/common/js/utils";
import Crontab from "../cron/Crontab"; import Crontab from "../cron/Crontab";
import CrontabResult from "../cron/CrontabResult"; import CrontabResult from "../cron/CrontabResult";
import {cronValidate} from "@/common/js/cron"; import {cronValidate} from "@/common/js/cron";
@ -112,7 +118,7 @@ export default {
initUserList() { initUserList() {
this.result = this.$get('user/ws/member/list/' + getCurrentWorkspaceId(), response => { this.result = this.$post('/user/project/member/list', {projectId: getCurrentProjectID()}, response => {
this.scheduleReceiverOptions = response.data; this.scheduleReceiverOptions = response.data;
}); });

4
frontend/src/business/components/project/notification/TaskNotification.vue
View File

@ -77,7 +77,7 @@
</template> </template>
<script> <script>
import {getCurrentUser, getCurrentWorkspaceId} from "@/common/js/utils"; import {getCurrentProjectID, getCurrentUser} from "@/common/js/utils";
import JenkinsNotification from "@/business/components/project/notification/jenkins/JenkinsNotification"; import JenkinsNotification from "@/business/components/project/notification/jenkins/JenkinsNotification";
import TestPlanTaskNotification from "@/business/components/project/notification/track/TestPlanTaskNotification"; import TestPlanTaskNotification from "@/business/components/project/notification/track/TestPlanTaskNotification";
import TestReviewNotification from "@/business/components/project/notification/track/TestReviewNotification"; import TestReviewNotification from "@/business/components/project/notification/track/TestReviewNotification";
@ -160,7 +160,7 @@ export default {
}, },
initUserList() { initUserList() {
this.result = this.$get('user/ws/member/list/' + getCurrentWorkspaceId(), response => { this.result = this.$post('/user/project/member/list', {projectId: getCurrentProjectID()}, response => {
this.jenkinsReceiverOptions = response.data; this.jenkinsReceiverOptions = response.data;
this.reviewReceiverOptions = response.data; this.reviewReceiverOptions = response.data;
this.defectReceiverOptions = response.data; this.defectReceiverOptions = response.data;

2
frontend/src/business/components/track/plan/components/ScheduleMaintain.vue
View File

@ -265,7 +265,7 @@ export default {
}); });
}, },
initUserList() { initUserList() {
this.result = this.$get('user/ws/member/list/' + getCurrentWorkspaceId(), response => { this.result = this.$post('/user/project/member/list', {projectId: getCurrentProjectID()}, response => {
this.scheduleReceiverOptions = response.data; this.scheduleReceiverOptions = response.data;
}); });
}, },

2
frontend/src/business/components/xpack

@ -1 +1 @@
Subproject commit ed3f0a6630c6f986fba4f9817f51310a6d37f5aa Subproject commit b78ba537b3c5094a20b2d04558b15ed869a7de7b