From e2da03f0a35ebd9778803a7720969f588531c3bd Mon Sep 17 00:00:00 2001 From: chenjianxing Date: Tue, 29 Sep 2020 17:04:16 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):?= =?UTF-8?q?=20=E5=8F=AA=E8=AF=BB=E7=94=A8=E6=88=B7=E8=AE=BF=E9=97=AE?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA=E9=80=80=E5=87=BA=E7=99=BB?= =?UTF-8?q?=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../track/controller/TestCaseReviewController.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/backend/src/main/java/io/metersphere/track/controller/TestCaseReviewController.java b/backend/src/main/java/io/metersphere/track/controller/TestCaseReviewController.java index dd0921a569..2bc29ebad7 100644 --- a/backend/src/main/java/io/metersphere/track/controller/TestCaseReviewController.java +++ b/backend/src/main/java/io/metersphere/track/controller/TestCaseReviewController.java @@ -25,6 +25,7 @@ import java.util.List; @RequestMapping("/test/case/review") @RestController +@RequiresRoles(value = {RoleConstants.TEST_MANAGER, RoleConstants.TEST_USER, RoleConstants.TEST_VIEWER}, logical = Logical.OR) public class TestCaseReviewController { @Resource @@ -33,7 +34,6 @@ public class TestCaseReviewController { TestReviewProjectService testReviewProjectService; @PostMapping("/list/{goPage}/{pageSize}") - @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR) public Pager> list(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody QueryCaseReviewRequest request) { Page page = PageHelper.startPage(goPage, pageSize, true); return PageUtils.setPageInfo(page, testCaseReviewService.listCaseReview(request)); @@ -46,19 +46,16 @@ public class TestCaseReviewController { } @PostMapping("/project") - @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR) public List getProjectByReviewId(@RequestBody TestCaseReview request) { return testCaseReviewService.getProjectByReviewId(request); } @PostMapping("/reviewer") - @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR) public List getUserByReviewId(@RequestBody TestCaseReview request) { return testCaseReviewService.getUserByReviewId(request); } @GetMapping("/recent/{count}") - @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR) public List recentTestPlans(@PathVariable int count) { String currentWorkspaceId = SessionUtils.getCurrentWorkspaceId(); PageHelper.startPage(1, count, true); From ee47268c6884af59cc52e3d1b064eadd63c9d8c6 Mon Sep 17 00:00:00 2001 From: shiziyuan9527 Date: Tue, 29 Sep 2020 17:32:11 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):?= =?UTF-8?q?=20=E6=B5=8B=E8=AF=95=E6=8A=A5=E5=91=8A=E4=B8=AD=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E7=94=A8=E4=BE=8B=E6=94=AF=E6=8C=81=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/java/io/metersphere/xpack | 2 +- .../src/business/components/track/plan/event-bus.js | 2 ++ .../plan/view/comonents/TestPlanTestCaseEdit.vue | 2 ++ .../plan/view/comonents/TestPlanTestCaseList.vue | 11 ++++++++++- .../TemplateComponent/FailureResultComponent.vue | 7 +++++++ frontend/src/business/components/xpack | 2 +- 6 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 frontend/src/business/components/track/plan/event-bus.js diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack index cf6b065263..c2dacf960c 160000 --- a/backend/src/main/java/io/metersphere/xpack +++ b/backend/src/main/java/io/metersphere/xpack @@ -1 +1 @@ -Subproject commit cf6b06526324326a563d933e07118fac014a63b4 +Subproject commit c2dacf960cdb1ed35664bdd3432120b1203b73d8 diff --git a/frontend/src/business/components/track/plan/event-bus.js b/frontend/src/business/components/track/plan/event-bus.js new file mode 100644 index 0000000000..789cde61b6 --- /dev/null +++ b/frontend/src/business/components/track/plan/event-bus.js @@ -0,0 +1,2 @@ +import Vue from 'vue'; +export const hub = new Vue(); diff --git a/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue b/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue index bf49aa1af6..a17de5d2a7 100644 --- a/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue +++ b/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue @@ -359,6 +359,8 @@ export default { handleClose() { removeGoBackListener(this.handleClose); this.showDialog = false; + this.searchParam.status = null; + this.$emit('update:search-param', this.searchParam); }, cancel() { this.handleClose(); diff --git a/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseList.vue index fed4989409..872d81f8e7 100644 --- a/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseList.vue +++ b/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseList.vue @@ -196,7 +196,7 @@ @@ -233,6 +233,7 @@ import ShowMoreBtn from "../../../case/components/ShowMoreBtn"; import BatchEdit from "../../../case/components/BatchEdit"; import ClassicEditor from "@ckeditor/ckeditor5-build-classic"; + import {hub} from "@/business/components/track/plan/event-bus"; export default { name: "TestPlanTestCaseList", @@ -336,9 +337,17 @@ } }, mounted() { + hub.$on("openFailureTestCase", row => { + this.isReadOnly = true; + this.condition.status = 'Failure'; + this.$refs.testPlanTestCaseEdit.openTestCaseEdit(row); + }); this.refreshTableAndPlan(); this.isTestManagerOrTestUser = checkoutTestManagerOrTestUser(); }, + beforeDestroy() { + hub.$off("openFailureTestCase"); + }, methods: { initTableData() { if (this.planId) { diff --git a/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/FailureResultComponent.vue b/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/FailureResultComponent.vue index e815160406..633728fc30 100644 --- a/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/FailureResultComponent.vue +++ b/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/FailureResultComponent.vue @@ -4,6 +4,7 @@