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.40 -r1.41 --- lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java 1 Nov 2006 05:08:39 -0000 1.40 +++ lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java 1 Nov 2006 05:15:17 -0000 1.41 @@ -382,12 +382,12 @@ } else if (workspaceFolder.getUserID().equals(user.getUserId())) { log.debug(user.getLogin()+" has owner access to "+workspaceFolder.getName()); permission = WorkspaceFolder.OWNER_ACCESS; - } else if(user.hasMemberAccess(workspaceFolder)) { - log.debug(user.getLogin()+" has membership access to "+workspaceFolder.getName()); - permission = WorkspaceFolder.MEMBERSHIP_ACCESS; } else if (userMgmtService.hasRoleInOrganisation(user, Role.ROLE_AUTHOR_ADMIN)){ log.debug(user.getLogin()+" has owner access to "+workspaceFolder.getName()); permission = WorkspaceFolder.OWNER_ACCESS; + } else if(user.hasMemberAccess(workspaceFolder)) { + log.debug(user.getLogin()+" has membership access to "+workspaceFolder.getName()); + permission = WorkspaceFolder.MEMBERSHIP_ACCESS; } else { log.debug(user.getLogin()+" has no access to "+workspaceFolder.getName()); permission = WorkspaceFolder.NO_ACCESS;