diff --git a/backend/src/main/resources/db/migration/V100__v1.15.2_release.sql b/backend/src/main/resources/db/migration/V100__v1.15.2_release.sql new file mode 100644 index 0000000000..c9ccb69015 --- /dev/null +++ b/backend/src/main/resources/db/migration/V100__v1.15.2_release.sql @@ -0,0 +1,24 @@ +-- project admin +insert into user_group_permission (id, group_id, permission_id, module_id) +values (UUID(), 'project_admin', 'WORKSPACE_PROJECT_ENVIRONMENT:READ+CREATE_GROUP', 'WORKSPACE_PROJECT_ENVIRONMENT'); +insert into user_group_permission (id, group_id, permission_id, module_id) +values (UUID(), 'project_admin', 'WORKSPACE_PROJECT_ENVIRONMENT:READ+EDIT_GROUP', 'WORKSPACE_PROJECT_ENVIRONMENT'); +insert into user_group_permission (id, group_id, permission_id, module_id) +values (UUID(), 'project_admin', 'WORKSPACE_PROJECT_ENVIRONMENT:READ+COPY_GROUP', 'WORKSPACE_PROJECT_ENVIRONMENT'); +insert into user_group_permission (id, group_id, permission_id, module_id) +values (UUID(), 'project_admin', 'WORKSPACE_PROJECT_ENVIRONMENT:READ+DELETE_GROUP', 'WORKSPACE_PROJECT_ENVIRONMENT'); +-- project member +insert into user_group_permission (id, group_id, permission_id, module_id) +values (UUID(), 'project_member', 'WORKSPACE_PROJECT_ENVIRONMENT:READ+CREATE_GROUP', 'WORKSPACE_PROJECT_ENVIRONMENT'); +insert into user_group_permission (id, group_id, permission_id, module_id) +values (UUID(), 'project_member', 'WORKSPACE_PROJECT_ENVIRONMENT:READ+EDIT_GROUP', 'WORKSPACE_PROJECT_ENVIRONMENT'); +insert into user_group_permission (id, group_id, permission_id, module_id) +values (UUID(), 'project_member', 'WORKSPACE_PROJECT_ENVIRONMENT:READ+COPY_GROUP', 'WORKSPACE_PROJECT_ENVIRONMENT'); +insert into user_group_permission (id, group_id, permission_id, module_id) +values (UUID(), 'project_member', 'WORKSPACE_PROJECT_ENVIRONMENT:READ+DELETE_GROUP', 'WORKSPACE_PROJECT_ENVIRONMENT'); +-- delete old permission +delete +from user_group_permission +where permission_id = 'WORKSPACE_TEMPLATE:READ+REPORT_TEMPLATE'; + + diff --git a/backend/src/main/resources/permission.json b/backend/src/main/resources/permission.json index 088158dd2e..60354593bf 100644 --- a/backend/src/main/resources/permission.json +++ b/backend/src/main/resources/permission.json @@ -105,11 +105,6 @@ "name": "编辑", "resourceId": "SYSTEM_SETTING" }, - { - "id": "SYSTEM_SETTING:READ+AUTH_MANAGE", - "name": "授权管理", - "resourceId": "SYSTEM_SETTING" - }, { "id": "SYSTEM_QUOTA:READ", "name": "查询系统配额", @@ -202,7 +197,7 @@ }, { "id": "WORKSPACE_PROJECT_ENVIRONMENT:READ", - "name": "查询环境", + "name": "查询", "resourceId": "WORKSPACE_PROJECT_ENVIRONMENT" }, { @@ -235,6 +230,26 @@ "name": "导出环境", "resourceId": "WORKSPACE_PROJECT_ENVIRONMENT" }, + { + "id": "WORKSPACE_PROJECT_ENVIRONMENT:READ+CREATE_GROUP", + "name": "创建环境组", + "resourceId": "WORKSPACE_PROJECT_ENVIRONMENT" + }, + { + "id": "WORKSPACE_PROJECT_ENVIRONMENT:READ+EDIT_GROUP", + "name": "编辑环境组", + "resourceId": "WORKSPACE_PROJECT_ENVIRONMENT" + }, + { + "id": "WORKSPACE_PROJECT_ENVIRONMENT:READ+COPY_GROUP", + "name": "复制环境组", + "resourceId": "WORKSPACE_PROJECT_ENVIRONMENT" + }, + { + "id": "WORKSPACE_PROJECT_ENVIRONMENT:READ+DELETE_GROUP", + "name": "删除环境组", + "resourceId": "WORKSPACE_PROJECT_ENVIRONMENT" + }, { "id": "WORKSPACE_OPERATING_LOG:READ", "name": "查询操作日志", @@ -260,11 +275,6 @@ "name": "自定义字段", "resourceId": "WORKSPACE_TEMPLATE" }, - { - "id": "WORKSPACE_TEMPLATE:READ+REPORT_TEMPLATE", - "name": "测试报告模版", - "resourceId": "WORKSPACE_TEMPLATE" - }, { "id": "PROJECT_USER:READ", "name": "查询成员", diff --git a/frontend/src/business/components/settings/system/BaseSetting.vue b/frontend/src/business/components/settings/system/BaseSetting.vue index dfaa923adc..92514a6c0a 100644 --- a/frontend/src/business/components/settings/system/BaseSetting.vue +++ b/frontend/src/business/components/settings/system/BaseSetting.vue @@ -19,7 +19,7 @@