diff --git a/jpress-web/src/main/java/io/jpress/web/admin/_UserController.java b/jpress-web/src/main/java/io/jpress/web/admin/_UserController.java index d871abc45d9696111fb82d648c48dd1c55a239cf..6db08b8e74b28d934f13df61267a2053997137ef 100644 --- a/jpress-web/src/main/java/io/jpress/web/admin/_UserController.java +++ b/jpress-web/src/main/java/io/jpress/web/admin/_UserController.java @@ -188,18 +188,15 @@ public class _UserController extends AdminControllerBase { Map groupCheck = new HashMap(); for (String groupKey : permissionGroup.keySet()) { List permList = permissionGroup.get(groupKey); - int length = permList.size(),index=0; for (Permission permission : permList) { boolean hasPerm = roleService.hasPermission(role.getId(), permission.getId()); - if (hasPerm) { - index++; + if (!hasPerm) { + groupCheck.put(groupKey, false); + break; + }else{ + groupCheck.put(groupKey, true); } } - if (length == index) { - groupCheck.put(groupKey, true); - }else{ - groupCheck.put(groupKey, false); - } } setAttr("groupCheck", groupCheck); diff --git a/jpress-web/src/main/resources/WEB-INF/views/admin/user/role_permissions.html b/jpress-web/src/main/resources/WEB-INF/views/admin/user/role_permissions.html index 72611268bfef78108bc0052e887fcf938c511e94..88d395eff1033683e61069afd96752c48d060b67 100755 --- a/jpress-web/src/main/resources/WEB-INF/views/admin/user/role_permissions.html +++ b/jpress-web/src/main/resources/WEB-INF/views/admin/user/role_permissions.html @@ -69,9 +69,11 @@ $(this).parent().find("span").attr("style","box-shadow: rgb(100, 189, 99) 0px 0px 0px 11px inset; border-color: rgb(100, 189, 99); background-color: rgb(100, 189, 99); transition: border 0.4s ease 0s, box-shadow 0.4s ease 0s, background-color 1.2s ease 0s;"); $(this).parent().find("small").attr("style", "left: 13px; background-color: rgb(255, 255, 255); transition: background-color 0.4s ease 0s, left 0.2s ease 0s;"); });**/ + + toastr.options.onHidden = function () { + location.reload(); + } toastr.success('操作成功。'); - //不优雅的解决方案 - location.reload(); } ) } @@ -92,9 +94,11 @@ $(this).parent().find("span").attr("style","box-shadow: rgb(223, 223, 223) 0px 0px 0px 0px inset;border-color: rgb(223, 223, 223);background-color: rgb(255, 255, 255);transition: border 0.4s ease 0s, box-shadow 0.4s ease 0s;"); $(this).parent().find("small").attr("style", "left: 0px; transition: background-color 0.4s ease 0s, left 0.2s ease 0s;"); });**/ + + toastr.options.onHidden = function () { + location.reload(); + } toastr.success('操作成功。'); - //不优雅的解决方案 - location.reload(); } ) } @@ -172,8 +176,13 @@
+ #if(role.isSuperAdmin()) + + #else + #end

#(x.key ??)