Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java =================================================================== diff -u -r94d7031afe75184d9285dc2c6e8d489d6285aa8d -r53475fdb1c711c8ea4034499ffa0380d8da83439 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java (.../IUserManagementService.java) (revision 94d7031afe75184d9285dc2c6e8d489d6285aa8d) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java (.../IUserManagementService.java) (revision 53475fdb1c711c8ea4034499ffa0380d8da83439) @@ -359,31 +359,6 @@ * @return * @throws IOException */ - public String getUsersFromOrganisationByRole(Integer organisationID, String roleName)throws IOException; + public String getUsersFromOrganisationByRole(Integer organisationID, String roleName)throws IOException; - /** - * This method returns a list of workspace folders for which - * the user has "write" access. A user can write/save his content - * in a folder in one of the following cases - *
    - *
  1. He is the OWNER of the given workspace folder
    2. - *
  2. He is a MEMBER of the organisation to which the - * folder belongs and he has one or all of the follwing - * roles (SYSADMIN. ADMIN, AUTHOR, STAFF, TEACHER)
    3. - *
- * - * The information returned is categorised under 3 main heads - * - * - * @param userID The user_id of the user for whom the - * folders have to fetched - * @return String The required information in WDDX format - * @throws IOException - */ - public String getAccessibleWorkspaceFolders(Integer userID)throws IOException; } Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java =================================================================== diff -u -r94d7031afe75184d9285dc2c6e8d489d6285aa8d -r53475fdb1c711c8ea4034499ffa0380d8da83439 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java (.../UserManagementService.java) (revision 94d7031afe75184d9285dc2c6e8d489d6285aa8d) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java (.../UserManagementService.java) (revision 53475fdb1c711c8ea4034499ffa0380d8da83439) @@ -605,87 +605,5 @@ + organisationID + " exists", FlashMessage.ERROR); return flashMessage.serializeMessage(); - } - - /** - * (non-Javadoc) - * @see org.lamsfoundation.lams.usermanagement.service.IUserManagementService#getAccessibleWorkspaceFolders(java.lang.Integer) - */ - public String getAccessibleWorkspaceFolders(Integer userID) - throws IOException { - User user = userDAO.getUserById(userID); - Hashtable table = new Hashtable(); - Vector workspaces = new Vector(); - - if (user != null) { - //add the user's own folder to the list - table.put("PRIVATE", new UserAccessFoldersDTO(user.getWorkspace() - .getRootFolder())); - table.put("RUN_SEQUENCES", new UserAccessFoldersDTO( - workspaceFolderDAO.getRunSequencesFolderForUser(user - .getUserId()))); - // Get a list of organisations of which the given user is a member - List userMemberships = userOrganisationDAO - .getUserOrganisationsByUser(user); - if (userMemberships != null) { - Iterator memberships = userMemberships.iterator(); - while (memberships.hasNext()) { - UserOrganisation member = (UserOrganisation) memberships - .next(); - // Get a list of roles that the user has in this - // organisation - Set roles = member.getUserOrganisationRoles(); - - /* - * Check if the user has write access, which is available - * only if the user has an AUTHOR, TEACHER or STAFF role. If - * he has acess add that folder to the list. - */ - if (hasWriteAccess(roles)) { - workspaces.add(new UserAccessFoldersDTO(member - .getOrganisation().getWorkspace() - .getRootFolder())); - } - } - table.put("ORGANISATIONS", workspaces); - flashMessage = new FlashMessage( - "getAccessibleWorkspaceFolders", table); - } else - flashMessage = new FlashMessage( - "getAccessibleWorkspaceFolders", - "User with user_id of: " + userID - + " is not a member of any organisation", - FlashMessage.ERROR); - - } else - flashMessage = FlashMessage.getNoSuchUserExists( - "getAccessibleWorkspaceFolders", userID); - - return flashMessage.serializeMessage(); - } - - /** - * This a utility method that checks whether user has write access. He can - * save his contents to a folder only if he is an AUTHOR,TEACHER or STAFF - * - * @param roles - * Set of roles that the user has - * @return boolean - * A boolean value indicating whether the user has "write" - * access or not. - */ - private boolean hasWriteAccess(Set roles) { - boolean access = false; - Iterator roleIterator = roles.iterator(); - while (roleIterator.hasNext()) { - UserOrganisationRole userOrganisationRole = (UserOrganisationRole) roleIterator - .next(); - Role role = userOrganisationRole.getRole(); - if (role.isAuthor() || role.isStaff() || role.isTeacher()) - access = true; - - } - return access; - } - + } } Index: lams_common/test/java/org/lamsfoundation/lams/usermanagement/TestUserManagementService.java =================================================================== diff -u -re8dae3d7178a12d09282f26c1c2257728f2fc65a -r53475fdb1c711c8ea4034499ffa0380d8da83439 --- lams_common/test/java/org/lamsfoundation/lams/usermanagement/TestUserManagementService.java (.../TestUserManagementService.java) (revision e8dae3d7178a12d09282f26c1c2257728f2fc65a) +++ lams_common/test/java/org/lamsfoundation/lams/usermanagement/TestUserManagementService.java (.../TestUserManagementService.java) (revision 53475fdb1c711c8ea4034499ffa0380d8da83439) @@ -94,10 +94,5 @@ public void testGetWorkspace()throws IOException{ String str = userManagementService.getWorkspace(new Integer(4)); System.out.println(str); - } - public void testGetAccessibleWorkspaceFolders()throws IOException{ - String packet = userManagementService.getAccessibleWorkspaceFolders(new Integer(4)); - System.out.println("User Accessible folders: " + packet); } - } Fisheye: Tag 53475fdb1c711c8ea4034499ffa0380d8da83439 refers to a dead (removed) revision in file `lams_documents/lams_common/sample_wddx_packets/userManagement/userAccessibleFolders.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_documents/lams_workspace/sample_wddx_packets/userAccessibleFolders.xml =================================================================== diff -u --- lams_documents/lams_workspace/sample_wddx_packets/userAccessibleFolders.xml (revision 0) +++ lams_documents/lams_workspace/sample_wddx_packets/userAccessibleFolders.xml (revision 53475fdb1c711c8ea4034499ffa0380d8da83439) @@ -0,0 +1 @@ +
getAccessibleWorkspaceFolders3.02004-12-23T0:0:0+10:0LAMS1.04.02004-12-23T0:0:0+10:0MACQUAIRE UNIVERSITY1.02.02004-12-23T0:0:0+10:0MELCOE1.03.02004-12-23T0:0:0+10:0MAMS1.05.02004-12-23T0:0:0+10:0Manpreet Minhas Run Sequences Folder6.07.02004-12-23T0:0:0+10:0Manpreet Minhas Workspace4.06.0 \ No newline at end of file