Index: lams_central/src/java/org/lamsfoundation/lams/workspace/service/IWorkspaceManagementService.java =================================================================== diff -u -rff6228b576d4e7056c01ba7d7d8a109a5b738838 -r902b2f38c23e260d4cd83ce964f5e8a9814e032c --- lams_central/src/java/org/lamsfoundation/lams/workspace/service/IWorkspaceManagementService.java (.../IWorkspaceManagementService.java) (revision ff6228b576d4e7056c01ba7d7d8a109a5b738838) +++ lams_central/src/java/org/lamsfoundation/lams/workspace/service/IWorkspaceManagementService.java (.../IWorkspaceManagementService.java) (revision 902b2f38c23e260d4cd83ce964f5e8a9814e032c) @@ -30,6 +30,7 @@ import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException; import org.lamsfoundation.lams.usermanagement.WorkspaceFolder; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; +import org.lamsfoundation.lams.usermanagement.dto.UserFlashDTO; import org.lamsfoundation.lams.usermanagement.exception.UserAccessDeniedException; import org.lamsfoundation.lams.usermanagement.exception.UserException; import org.lamsfoundation.lams.usermanagement.exception.WorkspaceFolderException; @@ -338,7 +339,7 @@ * @param role * @return */ - public Vector getUsersFromOrganisationByRole(Integer organisationID, String role) throws IOException; + public Vector getUsersFromOrganisationByRole(Integer organisationID, String role) throws IOException; /** * Returns a single OrganisationDTO with the user's roles included. If the user does not have Index: lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java =================================================================== diff -u -rc66f745b45abc4c00c05b80adeb67ba0759beb7e -r902b2f38c23e260d4cd83ce964f5e8a9814e032c --- lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java (.../WorkspaceManagementService.java) (revision c66f745b45abc4c00c05b80adeb67ba0759beb7e) +++ lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java (.../WorkspaceManagementService.java) (revision 902b2f38c23e260d4cd83ce964f5e8a9814e032c) @@ -63,6 +63,7 @@ import org.lamsfoundation.lams.usermanagement.WorkspaceFolder; import org.lamsfoundation.lams.usermanagement.dto.OrganisationDTO; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; +import org.lamsfoundation.lams.usermanagement.dto.UserFlashDTO; import org.lamsfoundation.lams.usermanagement.exception.UserAccessDeniedException; import org.lamsfoundation.lams.usermanagement.exception.UserException; import org.lamsfoundation.lams.usermanagement.exception.WorkspaceFolderException; @@ -1374,9 +1375,9 @@ /** * @see org.lamsfoundation.lams.workspace.service.IWorkspaceManagementService#getUsersFromOrganisationByRole(Integer, String) */ - public Vector getUsersFromOrganisationByRole(Integer organisationID, String roleName) + public Vector getUsersFromOrganisationByRole(Integer organisationID, String roleName) { - return userMgmtService.getUsersFromOrganisationByRole(organisationID, roleName); + return (Vector) userMgmtService.getUsersFromOrganisationByRole(organisationID, roleName, true); } Index: lams_central/src/java/org/lamsfoundation/lams/workspace/web/WorkspaceAction.java =================================================================== diff -u -r031ac35da79312f10fcb00449bb691d376f0cacb -r902b2f38c23e260d4cd83ce964f5e8a9814e032c --- lams_central/src/java/org/lamsfoundation/lams/workspace/web/WorkspaceAction.java (.../WorkspaceAction.java) (revision 031ac35da79312f10fcb00449bb691d376f0cacb) +++ lams_central/src/java/org/lamsfoundation/lams/workspace/web/WorkspaceAction.java (.../WorkspaceAction.java) (revision 902b2f38c23e260d4cd83ce964f5e8a9814e032c) @@ -40,6 +40,7 @@ import org.apache.struts.action.ActionMapping; import org.lamsfoundation.lams.usermanagement.WorkspaceFolder; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; +import org.lamsfoundation.lams.usermanagement.dto.UserFlashDTO; import org.lamsfoundation.lams.usermanagement.exception.UserAccessDeniedException; import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.util.WebUtil; @@ -562,7 +563,7 @@ FlashMessage flashMessage = null; try { IWorkspaceManagementService workspaceManagementService = getWorkspaceManagementService(); - Vector users = workspaceManagementService.getUsersFromOrganisationByRole(organisationID, role); + Vector users = workspaceManagementService.getUsersFromOrganisationByRole(organisationID, role); if ( log.isDebugEnabled()) { log.debug("getUsersFromOrganisationByRole: organisationID="+organisationID+" role="+role+" users "+users); }