test/MeterSphere
1
0
Fork 0
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git synced 2024-12-05 05:29:29 +08:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

fix(接口测试): 场景导入加判断_跳转加权限限制

Browse Source 
--user=郭雨琦
This commit is contained in:
guoyuqi 2022-03-29 15:41:01 +08:00 committed by 刘瑞斌
parent cf4ece462f
commit 56a30bc4f9
3 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
View File

@ -2067,6 +2067,12 @@ public class ApiAutomationService {
ApiScenarioWithBLOBs bloBs = getDto(object.getString("id"));
if (bloBs == null) {
object.put("referenced", "Copy");
}else{
CheckPermissionService checkPermissionService = CommonBeanFactory.getBean(CheckPermissionService.class);
Set<String> userRelatedProjectIds = checkPermissionService.getUserRelatedProjectIds();
if(!userRelatedProjectIds.contains(bloBs.getProjectId())){
object.put("referenced", "Copy");
}
}
}

15
frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
View File

@ -688,11 +688,11 @@ export default {
if (response.data) {
workspaceId = response.data.workspaceId;
isTurnSpace = true;
this.gotoTurn(resource, workspaceId, isTurnSpace);
this.checkPermission(resource, workspaceId, isTurnSpace);
}
});
} else {
this.gotoTurn(resource, workspaceId, isTurnSpace);
this.checkPermission(resource, workspaceId, isTurnSpace);
}
},
clickCase(resource) {
@ -757,6 +757,17 @@ export default {
}
});
}
},
checkPermission(resource, workspaceId, isTurnSpace){
this.$get('/project/getOwnerProjectIds', res => {
const project = res.data.find(p => p === resource.projectId);
if(!project){
this.$warning(this.$t('commons.no_permission'));
}else{
this.gotoTurn(resource, workspaceId, isTurnSpace)
}
})
}
}
}

14
frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue
View File

@ -264,11 +264,11 @@ export default {
if (response.data) {
workspaceId = response.data.workspaceId;
isTurnSpace = true;
this.gotoTurn(resource,workspaceId,isTurnSpace);
this.checkPermission(resource,workspaceId,isTurnSpace);
}
});
}else {
this.gotoTurn(resource,workspaceId,isTurnSpace);
this.checkPermission(resource,workspaceId,isTurnSpace);
}
},
@ -280,6 +280,16 @@ export default {
if(isTurnSpace){
window.open(automationData.href, '_blank');
}
},
checkPermission(resource,workspaceId,isTurnSpace){
this.$get('/project/getOwnerProjectIds', res => {
const project = res.data.find(p => p === resource.projectId);
if(!project){
this.$warning(this.$t('commons.no_permission'));
}else{
this.gotoTurn(resource,workspaceId,isTurnSpace)
}
})
}
}