Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java =================================================================== diff -u -r93201ac4b55c13e6d9a2a4a39941996d91793d13 -rf741601968539b96b0d6e9df19ec21fab64c16e2 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java (.../UserAction.java) (revision 93201ac4b55c13e6d9a2a4a39941996d91793d13) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java (.../UserAction.java) (revision f741601968539b96b0d6e9df19ec21fab64c16e2) @@ -84,12 +84,15 @@ request.setAttribute("org",orgId); } + request.setAttribute("canEdit",true); // remove sysadmin from role list for non-sysadmin users User requestor = (User)getService().getUserByLogin(request.getRemoteUser()); if(!getService().isUserInRole(requestor.getUserId(),getService().getRootOrganisation().getOrganisationId(),Role.SYSADMIN)){ Role sysadmin = new Role(); sysadmin.setRoleId(Role.ROLE_SYSADMIN); allRoles.remove(sysadmin); + // set canEdit flag for non-sysadmin users + request.setAttribute("canEdit",false); } request.setAttribute("rolelist",allRoles); request.setAttribute("locales",locales); Index: lams_admin/web/user.jsp =================================================================== diff -u -r94ffcde3b0dea448380b67d34a779ce1ef021e3a -rf741601968539b96b0d6e9df19ec21fab64c16e2 --- lams_admin/web/user.jsp (.../user.jsp) (revision 94ffcde3b0dea448380b67d34a779ce1ef021e3a) +++ lams_admin/web/user.jsp (.../user.jsp) (revision f741601968539b96b0d6e9df19ec21fab64c16e2) @@ -25,7 +25,8 @@
- + + @@ -109,7 +110,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
*:
:
Name:
: