Index: lams_central/src/java/org/lamsfoundation/lams/workspace/web/WorkspaceAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/workspace/web/WorkspaceAction.java,v
diff -u -r1.12 -r1.13
--- lams_central/src/java/org/lamsfoundation/lams/workspace/web/WorkspaceAction.java	11 Apr 2006 12:00:34 -0000	1.12
+++ lams_central/src/java/org/lamsfoundation/lams/workspace/web/WorkspaceAction.java	2 May 2006 05:30:39 -0000	1.13
@@ -59,6 +59,7 @@
 	
 	public static final String RESOURCE_ID = "resourceID";
 	public static final String RESOURCE_TYPE = "resourceType";
+	public static final String ROLE_DELIMITER = ",";
 	
 	/** 
 	 * Special value for folderID on getFolderContents(). Triggers getting the 
@@ -502,13 +503,14 @@
 			  HttpServletRequest request,
 			  HttpServletResponse response)throws Exception{
 		Integer userID = new Integer(WebUtil.readIntParam(request,AttributeNames.PARAM_USER_ID));
-		String role = WebUtil.readStrParam(request, "role");
+		String roles_str = WebUtil.readStrParam(request, "roles");
+		String[] roles = roles_str.split(ROLE_DELIMITER);
 		String wddxPacket = null;
 		try {
 			IWorkspaceManagementService workspaceManagementService = getWorkspaceManagementService();
-			wddxPacket = workspaceManagementService.getOrganisationsByUserRole(userID, role);		
+			wddxPacket = workspaceManagementService.getOrganisationsByUserRole(userID, roles);		
 		} catch (Exception e) {
-			log.error("getOrganisationsByUserRole: Exception occured. userID "+userID+" role "+role, e);
+			log.error("getOrganisationsByUserRole: Exception occured. userID "+userID+" role "+roles.toString(), e);
 			FlashMessage flashMessage = FlashMessage.getExceptionOccured(IWorkspaceManagementService.MSG_KEY_ORG_BY_ROLE, e.getMessage());
 			wddxPacket = flashMessage.serializeMessage();
 		}
@@ -521,6 +523,7 @@
 			  HttpServletResponse response)throws Exception{
 		Integer organisationID = new Integer(WebUtil.readIntParam(request,"organisationID"));
 		String role = WebUtil.readStrParam(request, "role");
+
 		String wddxPacket = null;
 		try {
 			IWorkspaceManagementService workspaceManagementService = getWorkspaceManagementService();