Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java,v
diff -u -r1.17 -r1.18
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java	10 Jul 2006 06:51:52 -0000	1.17
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java	11 Jul 2006 06:27:34 -0000	1.18
@@ -92,7 +92,14 @@
 		if(orgId != null) {
 		    request.setAttribute("org",orgId);
 		}
-				
+		
+		// remove sysadmin from role list for non-sysadmin users
+		User requestor = (User)service.getUserByLogin(request.getRemoteUser());
+		if(!service.isUserInRole(requestor.getUserId(),service.getRootOrganisation().getOrganisationId(),Role.SYSADMIN)){
+			Role sysadmin = new Role();
+			sysadmin.setRoleId(Role.ROLE_SYSADMIN);
+			allRoles.remove(sysadmin);
+		}
 		request.setAttribute("rolelist",allRoles);
 		request.setAttribute("locales",locales);