Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserBasicListAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserBasicListAction.java,v diff -u -r1.1 -r1.2 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserBasicListAction.java 5 Dec 2007 05:52:49 -0000 1.1 +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserBasicListAction.java 18 Dec 2007 04:53:08 -0000 1.2 @@ -89,11 +89,11 @@ // get users List users = new ArrayList(); if (request.isUserInRole(Role.SYSADMIN) || service.isUserGlobalGroupAdmin()) { - users = service.getAllUsers(group.getOrganisationId()); + users = service.getAllUsers(org.getOrganisationId()); } else if (service.isUserInRole(userId, group.getOrganisationId(), Role.GROUP_ADMIN) || service.isUserInRole(userId, group.getOrganisationId(), Role.GROUP_MANAGER)) { if (group.getCourseAdminCanBrowseAllUsers()){ - users = service.getAllUsers(group.getOrganisationId()); + users = service.getAllUsers(org.getOrganisationId()); } else if (org.getOrganisationType().getOrganisationTypeId().equals(OrganisationType.CLASS_TYPE)) { users = service.getUsersFromOrganisation(group.getOrganisationId(), orgId); }