Index: lams_central/src/java/org/lamsfoundation/lams/webservice/LearningDesignRepositorySoapBindingImpl.java =================================================================== diff -u -r9b568de783eb97624bb65df2ae4e43043b4913ba -r702e59550fe5cf8fb99232f59c42caab41ca4702 --- lams_central/src/java/org/lamsfoundation/lams/webservice/LearningDesignRepositorySoapBindingImpl.java (.../LearningDesignRepositorySoapBindingImpl.java) (revision 9b568de783eb97624bb65df2ae4e43043b4913ba) +++ lams_central/src/java/org/lamsfoundation/lams/webservice/LearningDesignRepositorySoapBindingImpl.java (.../LearningDesignRepositorySoapBindingImpl.java) (revision 702e59550fe5cf8fb99232f59c42caab41ca4702) @@ -160,15 +160,15 @@ Authenticator.authenticate(serverMap, datetime, username, hashValue); ExtUserUseridMap userMap = integrationService.getExtUserUseridMap(serverMap, username); integrationService.getExtCourseClassMap(serverMap, userMap, courseId, country, lang); - return buildContentTree(userMap.getUser().getUserId()).toString(); + return buildContentTree(userMap.getUser().getUserId(), mode).toString(); } catch (Exception e) { log.debug(e.getMessage(),e); throw new RemoteException(e.getMessage(), e); } } - private ContentTreeNode buildContentTree(Integer userId) throws IOException, + private ContentTreeNode buildContentTree(Integer userId, Integer mode) throws IOException, UserAccessDeniedException, RepositoryCheckedException { log.debug("User Id - "+userId); FolderContentDTO rootFolder = new FolderContentDTO(msgService @@ -177,7 +177,7 @@ WorkspaceFolder.READ_ACCESS, null); ContentTreeNode root = new ContentTreeNode(rootFolder); FolderContentDTO userFolder = service.getUserWorkspaceFolder(userId); - root.addChild(buildContentTreeNode(userFolder, userId)); + root.addChild(buildContentTreeNode(userFolder, userId, mode)); FolderContentDTO dummyOrgFolder = new FolderContentDTO(msgService .getMessage("organisations"), msgService.getMessage("folder"), null, null, FolderContentDTO.FOLDER, new Long(WorkspaceAction.ORG_FOLDER_ID.longValue()), @@ -189,25 +189,24 @@ Vector orgFolders = service.getAccessibleOrganisationWorkspaceFolders(userId); for (int i = 0; i < orgFolders.size(); i++) { FolderContentDTO orgFolder = (FolderContentDTO) orgFolders.get(i); - dummyOrgNode.addChild(buildContentTreeNode(orgFolder, userId)); + dummyOrgNode.addChild(buildContentTreeNode(orgFolder, userId, mode)); } root.addChild(dummyOrgNode); return root; } - private ContentTreeNode buildContentTreeNode(FolderContentDTO folder, Integer userId) + private ContentTreeNode buildContentTreeNode(FolderContentDTO folder, Integer userId, Integer mode) throws UserAccessDeniedException, RepositoryCheckedException { log.debug("build content tree node for folder - "+folder.getName()); ContentTreeNode node = new ContentTreeNode(folder); if (folder.getResourceType().equals(FolderContentDTO.FOLDER)) { log.debug(folder.getName()+" is a folder"); WorkspaceFolder wsfolder = service .getWorkspaceFolder(folder.getResourceID().intValue()); - Vector items = service.getFolderContentsExcludeHome(userId, wsfolder, - WorkspaceManagementService.MONITORING); + Vector items = service.getFolderContentsExcludeHome(userId, wsfolder, mode); for (int i = 0; i < items.size(); i++) { FolderContentDTO content = (FolderContentDTO) items.get(i); - node.addChild(buildContentTreeNode(content, userId)); + node.addChild(buildContentTreeNode(content, userId, mode)); } } return node;