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

菜单权限

This commit is contained in:
Captain.B 2020-03-02 15:29:00 +08:00
parent 0714200b5f
commit 4dbefc9404
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/controller/WorkspaceController.java
View File

@ -65,7 +65,7 @@ public class WorkspaceController {
} }
@PostMapping("list/all/{goPage}/{pageSize}") @PostMapping("list/all/{goPage}/{pageSize}")
@RequiresRoles(RoleConstants.ORG_ADMIN) @RequiresRoles(RoleConstants.ADMIN)
public Pager<List<WorkspaceDTO>> getAllWorkspaceList(@PathVariable int goPage, @PathVariable int pageSize) { public Pager<List<WorkspaceDTO>> getAllWorkspaceList(@PathVariable int goPage, @PathVariable int pageSize) {
Page<Object> page = PageHelper.startPage(goPage, pageSize, true); Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
return PageUtils.setPageInfo(page, workspaceService.getAllWorkspaceList()); return PageUtils.setPageInfo(page, workspaceService.getAllWorkspaceList());

6
frontend/src/performance/components/settings/SettingMenu.vue
View File

@ -5,9 +5,9 @@
<font-awesome-icon class="icon account" :icon="['far', 'address-card']" size="lg"/> <font-awesome-icon class="icon account" :icon="['far', 'address-card']" size="lg"/>
<span>系统</span> <span>系统</span>
</template> </template>
<el-menu-item index="/setting/user" v-permission="['admin']">用户</el-menu-item> <el-menu-item index="/setting/user">用户</el-menu-item>
<el-menu-item index="/setting/organization" v-permission="['admin']">组织</el-menu-item> <el-menu-item index="/setting/organization">组织</el-menu-item>
<el-menu-item index="/setting/systemworkspace" v-permission="['org_admin']">工作空间</el-menu-item> <el-menu-item index="/setting/systemworkspace">工作空间</el-menu-item>
<el-menu-item index="/setting/testresourcepool">测试资源池</el-menu-item> <el-menu-item index="/setting/testresourcepool">测试资源池</el-menu-item>
</el-submenu> </el-submenu>