diff --git a/project-management/frontend/src/business/menu/file/edit/EditFileMetadata.vue b/project-management/frontend/src/business/menu/file/edit/EditFileMetadata.vue index e79d9e96ce..a452968375 100644 --- a/project-management/frontend/src/business/menu/file/edit/EditFileMetadata.vue +++ b/project-management/frontend/src/business/menu/file/edit/EditFileMetadata.vue @@ -119,6 +119,14 @@ {{ fileBranch }} + + {{ data.path }} + + {{ data.type }} diff --git a/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanService.java b/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanService.java index 1dbcd039c7..ef525cde2a 100644 --- a/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanService.java +++ b/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanService.java @@ -2000,6 +2000,11 @@ public class TestPlanService { RunModeConfigDTO runModeConfig = getRunModeConfigDTO(testplanRunRequest, envType, envMap, environmentGroupId, testPlanId); runModeConfig.setTestPlanDefaultEnvMap(testplanRunRequest.getTestPlanDefaultEnvMap()); + if (!testplanRunRequest.isRunWithinResourcePool()) { + //未勾选资源池运行时,将资源池ID赋空 + runModeConfig.setResourcePoolId(null); + } + String apiRunConfig = JSON.toJSONString(runModeConfig); return this.runTestPlan(testPlanId, testplanRunRequest.getProjectId(), testplanRunRequest.getUserId(), testplanRunRequest.getTriggerMode(), testplanRunRequest.getReportId(), testplanRunRequest.getExecutionWay(), apiRunConfig);