SkyID
/
zheng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

规范命名

This commit is contained in:
shuzheng 2017-02-26 23:53:45 +08:00
parent 6ef9e9a861
commit 7ad1dc240f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsRoleController.java
View File

@ -56,7 +56,7 @@ public class UpmsRoleController extends BaseController {
return "/manage/role/index";
}
@ApiOperation(value = "角色授权")
@ApiOperation(value = "角色权限")
@RequiresPermissions("upms:role:permission")
@RequestMapping(value = "/permission/{id}", method = RequestMethod.GET)
public String permission(@PathVariable("id") int id, ModelMap modelMap) {
@ -65,7 +65,7 @@ public class UpmsRoleController extends BaseController {
return "/manage/role/permission";
}
@ApiOperation(value = "角色授权")
@ApiOperation(value = "角色权限")
@RequiresPermissions("upms:role:permission")
@RequestMapping(value = "/permission/{id}", method = RequestMethod.POST)
@ResponseBody

6
zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/role/index.jsp
View File

@ -21,7 +21,7 @@
<shiro:hasPermission name="upms:role:create"><a class="waves-effect waves-button" href="javascript:;" onclick="createAction()"><i class="zmdi zmdi-plus"></i> 新增角色</a></shiro:hasPermission>
<shiro:hasPermission name="upms:role:update"><a class="waves-effect waves-button" href="javascript:;" onclick="updateAction()"><i class="zmdi zmdi-edit"></i> 编辑角色</a></shiro:hasPermission>
<shiro:hasPermission name="upms:role:delete"><a class="waves-effect waves-button" href="javascript:;" onclick="deleteAction()"><i class="zmdi zmdi-close"></i> 删除角色</a></shiro:hasPermission>
<shiro:hasPermission name="upms:role:permission"><a class="waves-effect waves-button" href="javascript:;" onclick="permissionAction()"><i class="zmdi zmdi-key"></i> 角色授权</a></shiro:hasPermission>
<shiro:hasPermission name="upms:role:permission"><a class="waves-effect waves-button" href="javascript:;" onclick="permissionAction()"><i class="zmdi zmdi-key"></i> 角色权限</a></shiro:hasPermission>
</div>
<table id="table"></table>
</div>
@ -207,7 +207,7 @@ function deleteAction() {
});
}
}
// 授权
// 角色权限
var permissionDialog;
var roleId;
function permissionAction() {
@ -229,7 +229,7 @@ function permissionAction() {
roleId = rows[0].roleId;
permissionDialog = $.dialog({
animationSpeed: 300,
title: '角色授权',
title: '角色权限',
content: 'url:${basePath}/manage/role/permission/' + roleId,
onContentReady: function () {
initMaterialInput();