Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageAction.java,v diff -u -r1.10 -r1.11 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageAction.java 20 Jul 2006 23:48:46 -0000 1.10 +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageAction.java 1 Aug 2006 07:28:41 -0000 1.11 @@ -119,7 +119,8 @@ } // get list of users in org - List users = getService().getUsersFromOrganisation(orgId); + List users = getService().getUsersFromOrganisation(orgId); + Collections.sort(users); if(users==null){ errors.add("org",new ActionMessage("error.org.invalid")); saveErrors(request,errors); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgAction.java,v diff -u -r1.6 -r1.7 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgAction.java 20 Jul 2006 23:48:46 -0000 1.6 +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgAction.java 1 Aug 2006 07:28:41 -0000 1.7 @@ -25,6 +25,7 @@ package org.lamsfoundation.lams.admin.web; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import javax.servlet.http.HttpServletRequest; @@ -97,7 +98,7 @@ // get list of users in org User user = (User)getService().getUserByLogin(request.getRemoteUser()); - List users = new ArrayList(); + List users = new ArrayList(); Organisation orgOfCourseAdmin = (orgType.equals(OrganisationType.CLASS_TYPE)) ? parentOrg : organisation; if(request.isUserInRole(Role.SYSADMIN)){ users = getService().findAll(User.class); @@ -116,6 +117,7 @@ return mapping.findForward("error"); } } + Collections.sort(users); request.setAttribute("userlist",users); // create form object