Index: lams_central/src/java/org/lamsfoundation/lams/workspace/service/IWorkspaceManagementService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/workspace/service/IWorkspaceManagementService.java,v
diff -u -r1.11 -r1.12
--- lams_central/src/java/org/lamsfoundation/lams/workspace/service/IWorkspaceManagementService.java	11 Apr 2006 12:00:34 -0000	1.11
+++ lams_central/src/java/org/lamsfoundation/lams/workspace/service/IWorkspaceManagementService.java	2 May 2006 05:32:12 -0000	1.12
@@ -318,10 +318,10 @@
 	 * Retrieves the list of organisations in which the user has the specified role.
 	 * in WDDX format
 	 * @param userID
-	 * @param role
+	 * @param roles
 	 * @return
 	 */
-	public String getOrganisationsByUserRole(Integer userID, String role) throws IOException;
+	public String getOrganisationsByUserRole(Integer userID, String[] roles) throws IOException;
 	
 	/**
 	 * Returns the users within the Organisation with <code>organisationID</code>
Index: lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java,v
diff -u -r1.21 -r1.22
--- lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java	11 Apr 2006 12:53:10 -0000	1.21
+++ lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java	2 May 2006 05:32:12 -0000	1.22
@@ -31,6 +31,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
+import java.util.HashSet;
 import java.util.SortedSet;
 import java.util.Vector;
 
@@ -1399,20 +1400,25 @@
 	/**
 	 * @see org.lamsfoundation.lams.workspace.service.IWorkspaceManagementService#getOrganisationsByUserRole(Integer, String)
 	 */
-	public String getOrganisationsByUserRole(Integer userID, String role) throws IOException
+	public String getOrganisationsByUserRole(Integer userID, String[] roles) throws IOException
 	{
 		User user = userDAO.getUserById(userID);
-		Vector<OrganisationDTO> organisations = new Vector<OrganisationDTO>();
+		Set organisations = new HashSet();
+			
 		if (user!=null) {
+			for(int i=0; i<roles.length; i++) {
+				Iterator iterator = userMgmtService.getOrganisationsForUserByRole(user, roles[i]).iterator();
+				
+				while (iterator.hasNext()) {
+					Organisation organisation = (Organisation) iterator.next();
+					organisations.add(organisation.getOrganisationDTO());
+				}
+			}
 			
-			Iterator iterator = userMgmtService.getOrganisationsForUserByRole(user, role).iterator();
+			Vector<OrganisationDTO> orgs = new Vector<OrganisationDTO>(organisations);
 			
-			while (iterator.hasNext()) {
-				Organisation organisation = (Organisation) iterator.next();
-				organisations.add(organisation.getOrganisationDTO());
-			}
 			flashMessage = new FlashMessage(
-					MSG_KEY_ORG_BY_ROLE, organisations);
+					MSG_KEY_ORG_BY_ROLE, orgs);
 		} else
 			flashMessage = FlashMessage.getNoSuchUserExists(
 					MSG_KEY_ORG_BY_ROLE, userID);
@@ -1424,9 +1430,9 @@
 	/** 
 	 * @see org.lamsfoundation.lams.workspace.service.IWorkspaceManagementService#getUsersFromOrganisationByRole(Integer, String)
 	 */
-	public String getUsersFromOrganisationByRole(Integer organisationID, String role) throws IOException
+	public String getUsersFromOrganisationByRole(Integer organisationID, String roleName) throws IOException
 	{
-		return userMgmtService.getUsersFromOrganisationByRole(organisationID, role);
+		return userMgmtService.getUsersFromOrganisationByRole(organisationID, roleName);
 	}