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

fix_【项目设置】-项目成员权限登录系统后无”用户组和权限“页签 --bug=1007853 --user=王孝刚 【项目设置】-项目成员权限登录系统后无”用户组和权限“页签 https://www.tapd.cn/55049933/s/1066757

This commit is contained in:
wxg0103 2021-11-12 15:38:54 +08:00 committed by 刘瑞斌
parent 442a31b131
commit d7b9c1b18d
5 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backend/src/main/java/io/metersphere/commons/constants/PermissionConstants.java
View File

@ -80,6 +80,11 @@ public class PermissionConstants {
public static final String PROJECT_MANAGER_READ_EDIT = "PROJECT_MANAGER:READ+EDIT";
public static final String PROJECT_MANAGER_READ_DELETE = "PROJECT_MANAGER:READ+DELETE";
public static final String PROJECT_GROUP_READ = "PROJECT_GROUP:READ";
public static final String PROJECT_GROUP_READ_CREATE = "PROJECT_GROUP:READ+CREATE";
public static final String PROJECT_GROUP_READ_EDIT = "PROJECT_GROUP:READ+EDIT";
public static final String PROJECT_GROUP_READ_DELETE = "PROJECT_GROUP:READ+DELETE";
public static final String PROJECT_ENVIRONMENT_READ = "PROJECT_ENVIRONMENT:READ";
public static final String PROJECT_ENVIRONMENT_READ_CREATE = "PROJECT_ENVIRONMENT:READ+CREATE";
public static final String PROJECT_ENVIRONMENT_READ_EDIT = "PROJECT_ENVIRONMENT:READ+EDIT";

24
backend/src/main/resources/permission.json
View File

@ -285,6 +285,26 @@
"name": "移除成员",
"resourceId": "PROJECT_USER"
},
{
"id": "PROJECT_GROUP:READ",
"name": "查询用户组与权限",
"resourceId": "PROJECT_GROUP"
},
{
"id": "PROJECT_GROUP:READ+CREATE",
"name": "创建用户组与权限",
"resourceId": "PROJECT_GROUP"
},
{
"id": "PROJECT_GROUP:READ+EDIT",
"name": "编辑用户组与权限",
"resourceId": "PROJECT_GROUP"
},
{
"id": "PROJECT_GROUP:READ+DELETE",
"name": "删除用户组与权限",
"resourceId": "PROJECT_GROUP"
},
{
"id": "PROJECT_MANAGER:READ",
"name": "查询项目",
@ -869,6 +889,10 @@
"id": "PROJECT_MANAGER",
"name": "项目管理"
},
{
"id": "PROJECT_GROUP",
"name": "用户组与权限"
},
{
"id": "PROJECT_ENVIRONMENT",
"name": "环境设置"

2
frontend/src/business/components/project/head/ProjectHeaderMenus.vue
View File

@ -11,7 +11,7 @@
<el-menu-item :index="'/project/member'" v-permission="['PROJECT_USER:READ']">
{{ $t('project.member') }}
</el-menu-item>
<el-menu-item :index="'/project/usergroup'" v-permission="['SYSTEM_GROUP:READ+CREATE','ORGANIZATION_GROUP:READ+CREATE']">
<el-menu-item :index="'/project/usergroup'" v-permission="['PROJECT_GROUP:READ']">
{{ $t('project.group_permission') }}
</el-menu-item>
<el-menu-item :index="'/project/env'" v-permission="['PROJECT_ENVIRONMENT:READ']"

4
frontend/src/business/components/project/home/ProjectHome.vue
View File

@ -50,11 +50,11 @@
<div class="div-item">
<div style="float: left">
<i class="el-icon-user icon-color"
@click="click('/project/usergroup', ['PROJECT_USER:READ'])">
@click="click('/project/usergroup', ['PROJECT_GROUP:READ'])">
</i>
</div>
<div style="float: left">
<span class="title" @click="click('/project/usergroup', ['PROJECT_USER:READ'])">
<span class="title" @click="click('/project/usergroup', ['PROJECT_GROUP:READ'])">
{{ $t('group.group_permission') }}
</span><br/>
<span class="desc">{{ $t('project.group_desc') }}</span>

2
frontend/src/business/components/project/menu/UserGroup.vue
View File

@ -2,7 +2,7 @@
<div v-loading="result.loading">
<el-card>
<template v-slot:header>
<ms-table-header :create-permission="['SYSTEM_GROUP:READ+CREATE','ORGANIZATION_GROUP:READ+CREATE']"
<ms-table-header :create-permission="['PROJECT_GROUP:READ+CREATE']"
:condition.sync="condition" @search="initData" @create="create"
:create-tip="$t('group.create')"/>
</template>