Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java =================================================================== diff -u -r4c272618da715b9f814eb81630e92abf2ef1a736 -r4a2728da7ea82a98b92d3a8b08feb6efa4023b7d --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java (.../OrgManageAction.java) (revision 4c272618da715b9f814eb81630e92abf2ef1a736) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java (.../OrgManageAction.java) (revision 4a2728da7ea82a98b92d3a8b08feb6efa4023b7d) @@ -115,7 +115,7 @@ // Get list of child organisations depending on requestor's role and the organisation's type List orgManageBeans = new ArrayList(); Integer userId = ((UserDTO)SessionManager.getSession().getAttribute(AttributeNames.USER)).getUserID(); - if(request.isUserInRole(Role.SYSADMIN) || request.isUserInRole(Role.COURSE_ADMIN) || request.isUserInRole(Role.COURSE_MANAGER)){ + if(request.isUserInRole(Role.SYSADMIN) || request.isUserInRole(Role.GROUP_ADMIN) || request.isUserInRole(Role.GROUP_MANAGER)){ // the organisation type of the children Integer type; if(orgManageForm.getType().equals(OrganisationType.ROOT_TYPE)){ @@ -132,8 +132,8 @@ Organisation parentOrg = (type.equals(OrganisationType.CLASS_TYPE)) ? organisation.getParentOrganisation() : organisation; // do not list this org as a child if requestor is not an admin or manager in the parent, or global admin if (!request.isUserInRole(Role.SYSADMIN)) { - if (!(service.isUserInRole(userId, parentOrg.getOrganisationId(), Role.COURSE_ADMIN) - || service.isUserInRole(userId, parentOrg.getOrganisationId(), Role.COURSE_MANAGER) + if (!(service.isUserInRole(userId, parentOrg.getOrganisationId(), Role.GROUP_ADMIN) + || service.isUserInRole(userId, parentOrg.getOrganisationId(), Role.GROUP_MANAGER) || service.isUserGlobalGroupAdmin())) continue; } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/RegisterAction.java =================================================================== diff -u -r498dc2bacfaa94ca75f1ff49f5d14382334fd33b -r4a2728da7ea82a98b92d3a8b08feb6efa4023b7d --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/RegisterAction.java (.../RegisterAction.java) (revision 498dc2bacfaa94ca75f1ff49f5d14382334fd33b) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/RegisterAction.java (.../RegisterAction.java) (revision 4a2728da7ea82a98b92d3a8b08feb6efa4023b7d) @@ -99,10 +99,10 @@ List groups = service.findByProperty(Organisation.class,"organisationType.organisationTypeId",OrganisationType.COURSE_TYPE); List subgroups = service.findByProperty(Organisation.class,"organisationType.organisationTypeId",OrganisationType.CLASS_TYPE); List sysadmins = service.findByProperty(UserOrganisationRole.class, "role.roleId", Role.ROLE_SYSADMIN); - List admins = service.findByProperty(UserOrganisationRole.class, "role.roleId", Role.ROLE_COURSE_ADMIN); + List admins = service.findByProperty(UserOrganisationRole.class, "role.roleId", Role.ROLE_GROUP_ADMIN); List authors = service.findByProperty(UserOrganisationRole.class, "role.roleId", Role.ROLE_AUTHOR); List monitors = service.findByProperty(UserOrganisationRole.class, "role.roleId", Role.ROLE_MONITOR); - List managers = service.findByProperty(UserOrganisationRole.class, "role.roleId", Role.ROLE_COURSE_MANAGER); + List managers = service.findByProperty(UserOrganisationRole.class, "role.roleId", Role.ROLE_GROUP_MANAGER); List learners = service.findByProperty(UserOrganisationRole.class, "role.roleId", Role.ROLE_LEARNER); /** Set statistics in dyna form */ Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java =================================================================== diff -u -r4c272618da715b9f814eb81630e92abf2ef1a736 -r4a2728da7ea82a98b92d3a8b08feb6efa4023b7d --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java (.../UserAction.java) (revision 4c272618da715b9f814eb81630e92abf2ef1a736) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java (.../UserAction.java) (revision 4a2728da7ea82a98b92d3a8b08feb6efa4023b7d) @@ -116,8 +116,8 @@ Integer orgIdOfCourse = (orgType.getOrganisationTypeId().equals(OrganisationType.CLASS_TYPE)) ? org.getParentOrganisation().getOrganisationId() : orgId; User requestor = (User)service.getUserByLogin(request.getRemoteUser()); - requestorHasRole = service.isUserInRole(requestor.getUserId(), orgIdOfCourse, Role.COURSE_ADMIN) - || service.isUserInRole(requestor.getUserId(), orgIdOfCourse, Role.COURSE_MANAGER); + requestorHasRole = service.isUserInRole(requestor.getUserId(), orgIdOfCourse, Role.GROUP_ADMIN) + || service.isUserInRole(requestor.getUserId(), orgIdOfCourse, Role.GROUP_MANAGER); } } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageAction.java =================================================================== diff -u -r4c272618da715b9f814eb81630e92abf2ef1a736 -r4a2728da7ea82a98b92d3a8b08feb6efa4023b7d --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageAction.java (.../UserManageAction.java) (revision 4c272618da715b9f814eb81630e92abf2ef1a736) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageAction.java (.../UserManageAction.java) (revision 4a2728da7ea82a98b92d3a8b08feb6efa4023b7d) @@ -114,8 +114,8 @@ || (service.isUserGlobalGroupAdmin() && !orgId.equals(rootOrgId))){ userManageForm.setCourseAdminCanAddNewUsers(true); userManageForm.setCourseAdminCanBrowseAllUsers(true); - }else if((service.isUserInRole(userId,orgOfCourseAdmin.getOrganisationId(),Role.COURSE_ADMIN) - || service.isUserInRole(userId,orgOfCourseAdmin.getOrganisationId(),Role.COURSE_MANAGER)) + }else if((service.isUserInRole(userId,orgOfCourseAdmin.getOrganisationId(),Role.GROUP_ADMIN) + || service.isUserInRole(userId,orgOfCourseAdmin.getOrganisationId(),Role.GROUP_MANAGER)) && !orgId.equals(rootOrgId)){ userManageForm.setCourseAdminCanAddNewUsers(orgOfCourseAdmin.getCourseAdminCanAddNewUsers()); userManageForm.setCourseAdminCanBrowseAllUsers(orgOfCourseAdmin.getCourseAdminCanBrowseAllUsers()); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgAction.java =================================================================== diff -u -r4c272618da715b9f814eb81630e92abf2ef1a736 -r4a2728da7ea82a98b92d3a8b08feb6efa4023b7d --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgAction.java (.../UserOrgAction.java) (revision 4c272618da715b9f814eb81630e92abf2ef1a736) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgAction.java (.../UserOrgAction.java) (revision 4a2728da7ea82a98b92d3a8b08feb6efa4023b7d) @@ -108,8 +108,8 @@ if(request.isUserInRole(Role.SYSADMIN) || service.isUserGlobalGroupAdmin()){ users = service.findAll(User.class); - }else if(service.isUserInRole(userId,orgOfCourseAdmin.getOrganisationId(),Role.COURSE_ADMIN) - || service.isUserInRole(userId,orgOfCourseAdmin.getOrganisationId(),Role.COURSE_MANAGER)){ + }else if(service.isUserInRole(userId,orgOfCourseAdmin.getOrganisationId(),Role.GROUP_ADMIN) + || service.isUserInRole(userId,orgOfCourseAdmin.getOrganisationId(),Role.GROUP_MANAGER)){ if(orgOfCourseAdmin.getCourseAdminCanBrowseAllUsers()){ users = service.findAll(User.class); }else if(orgType.equals(OrganisationType.CLASS_TYPE)){ Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserRolesAction.java =================================================================== diff -u -r4c272618da715b9f814eb81630e92abf2ef1a736 -r4a2728da7ea82a98b92d3a8b08feb6efa4023b7d --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserRolesAction.java (.../UserRolesAction.java) (revision 4c272618da715b9f814eb81630e92abf2ef1a736) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserRolesAction.java (.../UserRolesAction.java) (revision 4a2728da7ea82a98b92d3a8b08feb6efa4023b7d) @@ -112,8 +112,8 @@ Boolean isSysadmin = request.isUserInRole(Role.SYSADMIN); User requestor = (User)service.getUserByLogin(request.getRemoteUser()); Integer rootOrgId = service.getRootOrganisation().getOrganisationId(); - Boolean requestorHasRole = service.isUserInRole(requestor.getUserId(), orgIdOfCourse, Role.COURSE_MANAGER) - || (service.isUserInRole(requestor.getUserId(), orgIdOfCourse, Role.COURSE_ADMIN) && !rootOrgId.equals(orgId)) + Boolean requestorHasRole = service.isUserInRole(requestor.getUserId(), orgIdOfCourse, Role.GROUP_MANAGER) + || (service.isUserInRole(requestor.getUserId(), orgIdOfCourse, Role.GROUP_ADMIN) && !rootOrgId.equals(orgId)) || (service.isUserGlobalGroupAdmin() && !rootOrgId.equals(orgId)); if (!(requestorHasRole || isSysadmin)) { Index: lams_build/lib/lams/lams.jar =================================================================== diff -u -rf0b1688e337075cd06a3b830e45ddd51d6ba4fe0 -r4a2728da7ea82a98b92d3a8b08feb6efa4023b7d Binary files differ Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java =================================================================== diff -u -re674ee8c8ff4d3d75456b57586d1ea5c090d55b9 -r4a2728da7ea82a98b92d3a8b08feb6efa4023b7d --- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java (.../HomeAction.java) (revision e674ee8c8ff4d3d75456b57586d1ea5c090d55b9) +++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java (.../HomeAction.java) (revision 4a2728da7ea82a98b92d3a8b08feb6efa4023b7d) @@ -253,7 +253,7 @@ return mapping.findForward("error"); } else { Integer orgId = classId != null ? classId : courseId; - if (getService().isUserInRole(user.getUserID(), orgId, Role.MONITOR)||getService().isUserInRole(user.getUserID(), orgId, Role.COURSE_MANAGER)) { + if (getService().isUserInRole(user.getUserID(), orgId, Role.MONITOR)||getService().isUserInRole(user.getUserID(), orgId, Role.GROUP_MANAGER)) { log.debug("user is staff"); String serverUrl = Configuration.get(ConfigurationKeys.SERVER_URL); req.setAttribute("serverUrl", serverUrl); Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java =================================================================== diff -u -r4c272618da715b9f814eb81630e92abf2ef1a736 -r4a2728da7ea82a98b92d3a8b08feb6efa4023b7d --- lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java (.../IndexAction.java) (revision 4c272618da715b9f814eb81630e92abf2ef1a736) +++ lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java (.../IndexAction.java) (revision 4a2728da7ea82a98b92d3a8b08feb6efa4023b7d) @@ -154,7 +154,7 @@ headerLinks.add(new IndexLinkBean("index.myprofile", "index.do?state=active&tab=profile")); if(Configuration.getAsBoolean(ConfigurationKeys.LAMS_COMMUNITY_ENABLE)) - if (request.isUserInRole(Role.SYSADMIN) || request.isUserInRole(Role.COURSE_ADMIN) || request.isUserInRole(Role.COURSE_MANAGER) || + if (request.isUserInRole(Role.SYSADMIN) || request.isUserInRole(Role.GROUP_ADMIN) || request.isUserInRole(Role.GROUP_MANAGER) || request.isUserInRole(Role.AUTHOR) || request.isUserInRole(Role.AUTHOR_ADMIN) || request.isUserInRole(Role.MONITOR)) headerLinks.add(new IndexLinkBean("index.community", "index.do?state=active&tab=community")); @@ -164,7 +164,7 @@ private void setAdminLinks(HttpServletRequest request) { List adminLinks = new ArrayList(); - if (request.isUserInRole(Role.SYSADMIN) || request.isUserInRole(Role.COURSE_ADMIN) || request.isUserInRole(Role.COURSE_MANAGER)) + if (request.isUserInRole(Role.SYSADMIN) || request.isUserInRole(Role.GROUP_ADMIN) || request.isUserInRole(Role.GROUP_MANAGER)) adminLinks.add(new IndexLinkBean("index.courseman", "javascript:openOrgManagement(" + getService().getRootOrganisation().getOrganisationId()+')')); if (request.isUserInRole(Role.SYSADMIN) || request.isUserInRole(Role.AUTHOR_ADMIN) || getService().isUserGlobalGroupAdmin()) adminLinks.add(new IndexLinkBean("index.sysadmin", "javascript:openSysadmin()")); @@ -182,16 +182,16 @@ links.add(new IndexLinkBean("index.classman", "javascript:openOrgManagement(" + org.getOrganisationId()+")", "manage-group-button")); } } - if ((contains(roles, Role.ROLE_COURSE_ADMIN) || contains(roles, Role.ROLE_COURSE_MANAGER) || contains(roles,Role.ROLE_MONITOR)) + if ((contains(roles, Role.ROLE_GROUP_ADMIN) || contains(roles, Role.ROLE_GROUP_MANAGER) || contains(roles,Role.ROLE_MONITOR)) && state.equals(OrganisationState.ACTIVE)) { if (orgBean.getType().equals(OrganisationType.COURSE_TYPE)) { - if((!isSysAdmin)&&(contains(roles, Role.ROLE_COURSE_ADMIN) || contains(roles, Role.ROLE_COURSE_MANAGER))){ + if((!isSysAdmin)&&(contains(roles, Role.ROLE_GROUP_ADMIN) || contains(roles, Role.ROLE_GROUP_MANAGER))){ links.add(new IndexLinkBean("index.classman", "javascript:openOrgManagement(" + org.getOrganisationId()+")", "manage-group-button")); } - if(contains(roles, Role.ROLE_COURSE_MANAGER) || contains(roles,Role.ROLE_MONITOR)) + if(contains(roles, Role.ROLE_GROUP_MANAGER) || contains(roles,Role.ROLE_MONITOR)) links.add(new IndexLinkBean("index.addlesson", "javascript:openAddLesson(" + org.getOrganisationId()+",'')", "add-lesson-button")); }else{//CLASS_TYPE - if(contains(roles, Role.ROLE_COURSE_MANAGER) || contains(roles,Role.ROLE_MONITOR)) + if(contains(roles, Role.ROLE_GROUP_MANAGER) || contains(roles,Role.ROLE_MONITOR)) links.add(new IndexLinkBean("index.addlesson","javascript:openAddLesson("+org.getParentOrganisation().getOrganisationId()+","+org.getOrganisationId()+")", "add-lesson-button")); } } @@ -206,7 +206,7 @@ List lessonLinks = new ArrayList(); String url = null; if(state.equals(OrganisationState.ACTIVE)){ - if(contains(roles,Role.ROLE_COURSE_MANAGER)||contains(roles,Role.ROLE_MONITOR)){ + if(contains(roles,Role.ROLE_GROUP_MANAGER)||contains(roles,Role.ROLE_MONITOR)){ if(!lesson.getLessonStateId().equals(lesson.REMOVED_STATE)){ lessonLinks.add(new IndexLinkBean("index.monitor", "javascript:openMonitorLesson(" + lesson.getLessonId()+")")); } @@ -218,7 +218,7 @@ } } }else if(state.equals(OrganisationState.ARCHIVED)){ - if(contains(roles,Role.ROLE_COURSE_MANAGER)){ + if(contains(roles,Role.ROLE_GROUP_MANAGER)){ if(!lesson.getLessonStateId().equals(lesson.REMOVED_STATE)){ lessonLinks.add(new IndexLinkBean("index.monitor", "javascript:openMonitorLesson(" + lesson.getLessonId()+")")); } @@ -252,7 +252,7 @@ for(UserOrganisationRole userOrganisationRole:userOrganisationRoles){ classRoles.add(userOrganisationRole.getRole().getRoleId()); } - if(contains(roles,Role.ROLE_COURSE_MANAGER)) classRoles.add(Role.ROLE_COURSE_MANAGER); + if(contains(roles,Role.ROLE_GROUP_MANAGER)) classRoles.add(Role.ROLE_GROUP_MANAGER); childOrgBeans.add(createOrgBean(organisation,classRoles,username,isSysAdmin)); } } Index: lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java =================================================================== diff -u -rf0c3f41d54ef4f390ef3f93f28c0679c46b6730c -r4a2728da7ea82a98b92d3a8b08feb6efa4023b7d --- lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java (.../LoginRequestServlet.java) (revision f0c3f41d54ef4f390ef3f93f28c0679c46b6730c) +++ lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java (.../LoginRequestServlet.java) (revision 4a2728da7ea82a98b92d3a8b08feb6efa4023b7d) @@ -142,8 +142,8 @@ Organisation org = orgMap.getOrganisation(); IUserManagementService userManagementService = integrationService.getService(); UserOrganisation uo = userManagementService.getUserOrganisation(user.getUserId(), org.getOrganisationId()); - //COURSE_MANAGER role is to enable user to see the course's workspace folder - Integer[] roleIds = new Integer[]{Role.ROLE_AUTHOR,Role.ROLE_COURSE_MANAGER,Role.ROLE_LEARNER}; + //GROUP_MANAGER role is to enable user to see the course's workspace folder + Integer[] roleIds = new Integer[]{Role.ROLE_AUTHOR,Role.ROLE_GROUP_MANAGER,Role.ROLE_LEARNER}; //we have to assign all the roles to the external user here, because once the user logged in, the roles //are cached in JBoss, all the calls of request.isUserInRole() will be based on the cached roles Map properties = new HashMap(); Index: lams_central/src/java/org/lamsfoundation/lams/webservice/RegisterServiceSoapBindingImpl.java =================================================================== diff -u -r2f232c2fe9781a2deca52b5782759e05fe25f6b9 -r4a2728da7ea82a98b92d3a8b08feb6efa4023b7d --- lams_central/src/java/org/lamsfoundation/lams/webservice/RegisterServiceSoapBindingImpl.java (.../RegisterServiceSoapBindingImpl.java) (revision 2f232c2fe9781a2deca52b5782759e05fe25f6b9) +++ lams_central/src/java/org/lamsfoundation/lams/webservice/RegisterServiceSoapBindingImpl.java (.../RegisterServiceSoapBindingImpl.java) (revision 4a2728da7ea82a98b92d3a8b08feb6efa4023b7d) @@ -102,7 +102,7 @@ UserOrganisation uo = new UserOrganisation(user, org); service.save(uo); Integer[] roles = new Integer[] { Role.ROLE_AUTHOR, Role.ROLE_MONITOR, - Role.ROLE_COURSE_MANAGER, Role.ROLE_LEARNER }; + Role.ROLE_GROUP_MANAGER, Role.ROLE_LEARNER }; for (Integer roleId : roles) { UserOrganisationRole uor = new UserOrganisationRole(uo, (Role) service.findById( Role.class, roleId)); Index: lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java =================================================================== diff -u -r6decbd9fa741ca41a0399a55b3d62398cbdecb82 -r4a2728da7ea82a98b92d3a8b08feb6efa4023b7d --- lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java (.../WorkspaceManagementService.java) (revision 6decbd9fa741ca41a0399a55b3d62398cbdecb82) +++ lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java (.../WorkspaceManagementService.java) (revision 4a2728da7ea82a98b92d3a8b08feb6efa4023b7d) @@ -1188,7 +1188,7 @@ while (roleIterator.hasNext()) { UserOrganisationRole userOrganisationRole = (UserOrganisationRole) roleIterator.next(); Role role = userOrganisationRole.getRole(); - if (role.isAuthor() || role.isSysAdmin() || role.isCourseManager() || role.isAuthorAdmin()) + if (role.isAuthor() || role.isSysAdmin() || role.isGroupManager() || role.isAuthorAdmin()) return true; } return false; Index: lams_common/db/sql/insert_types_data.sql =================================================================== diff -u -rdbf5a29202c6c8b861a65b8798849a828907af4d -r4a2728da7ea82a98b92d3a8b08feb6efa4023b7d --- lams_common/db/sql/insert_types_data.sql (.../insert_types_data.sql) (revision dbf5a29202c6c8b861a65b8798849a828907af4d) +++ lams_common/db/sql/insert_types_data.sql (.../insert_types_data.sql) (revision 4a2728da7ea82a98b92d3a8b08feb6efa4023b7d) @@ -15,11 +15,11 @@ INSERT INTO lams_privilege VALUES (14,'M','write/create/delete permissions in all course content folders'); INSERT INTO lams_role VALUES (1, 'SYSADMIN', 'LAMS System Adminstrator', NOW()); -INSERT INTO lams_role VALUES (2, 'COURSE MANAGER', 'Course Manager', NOW()); +INSERT INTO lams_role VALUES (2, 'GROUP MANAGER', 'Group Manager', NOW()); INSERT INTO lams_role VALUES (3, 'AUTHOR', 'Authors Learning Designs', NOW()); INSERT INTO lams_role VALUES (4, 'MONITOR', 'Member of Staff', NOW()); INSERT INTO lams_role VALUES (5, 'LEARNER', 'Student', NOW()); -INSERT INTO lams_role VALUES (6, 'COURSE ADMIN', 'Course Administrator', NOW()); +INSERT INTO lams_role VALUES (6, 'GROUP ADMIN', 'Group Administrator', NOW()); INSERT INTO lams_role VALUES (7, 'AUTHOR ADMIN', 'Author Administrator', NOW()); INSERT INTO lams_role_privilege VALUES (1,1,1); Index: lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java =================================================================== diff -u -r1037e70251273c8c7ff4d9b62068e5fe1f07c87e -r4a2728da7ea82a98b92d3a8b08feb6efa4023b7d --- lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java (.../IntegrationService.java) (revision 1037e70251273c8c7ff4d9b62068e5fe1f07c87e) +++ lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java (.../IntegrationService.java) (revision 4a2728da7ea82a98b92d3a8b08feb6efa4023b7d) @@ -111,7 +111,7 @@ private void addMemberships(User user, Organisation org){ UserOrganisation uo = new UserOrganisation(user,org); service.save(uo); - Integer[] roles = new Integer[]{Role.ROLE_AUTHOR, Role.ROLE_MONITOR, Role.ROLE_COURSE_MANAGER, Role.ROLE_LEARNER}; + Integer[] roles = new Integer[]{Role.ROLE_AUTHOR, Role.ROLE_MONITOR, Role.ROLE_GROUP_MANAGER, Role.ROLE_LEARNER}; for(Integer roleId:roles){ UserOrganisationRole uor = new UserOrganisationRole(uo,(Role)service.findById(Role.class,roleId)); service.save(uor); Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/Role.java =================================================================== diff -u -r4b181ebda12a35a61d945b5bb2d286c124b76e62 -r4a2728da7ea82a98b92d3a8b08feb6efa4023b7d --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/Role.java (.../Role.java) (revision 4b181ebda12a35a61d945b5bb2d286c124b76e62) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/Role.java (.../Role.java) (revision 4a2728da7ea82a98b92d3a8b08feb6efa4023b7d) @@ -26,6 +26,7 @@ import java.io.Serializable; import java.util.HashSet; import java.util.Set; + import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; @@ -45,9 +46,9 @@ public static final String AUTHOR_ADMIN = "AUTHOR ADMIN"; - public static final String COURSE_MANAGER = "COURSE MANAGER"; + public static final String GROUP_MANAGER = "GROUP MANAGER"; - public static final String COURSE_ADMIN = "COURSE ADMIN"; + public static final String GROUP_ADMIN = "GROUP ADMIN"; public static final String SYSADMIN = "SYSADMIN";//for future use @@ -61,11 +62,11 @@ * ************************************************************/ public static final Integer ROLE_SYSADMIN =new Integer(1); - public static final Integer ROLE_COURSE_MANAGER =new Integer(2); + public static final Integer ROLE_GROUP_MANAGER =new Integer(2); public static final Integer ROLE_AUTHOR =new Integer(3); public static final Integer ROLE_MONITOR =new Integer(4); public static final Integer ROLE_LEARNER =new Integer(5); - public static final Integer ROLE_COURSE_ADMIN =new Integer(6); + public static final Integer ROLE_GROUP_ADMIN =new Integer(6); public static final Integer ROLE_AUTHOR_ADMIN =new Integer(7); /***********************************************************/ @@ -215,12 +216,12 @@ public boolean isAuthor(){ return this.roleId.equals(ROLE_AUTHOR); } - public boolean isCourseManager(){ - return this.roleId.equals(ROLE_COURSE_MANAGER); + public boolean isGroupManager(){ + return this.roleId.equals(ROLE_GROUP_MANAGER); } - public boolean isCourseAdmin(){ - return this.roleId.equals(ROLE_COURSE_ADMIN); + public boolean isGroupAdmin(){ + return this.roleId.equals(ROLE_GROUP_ADMIN); } public boolean isMonitor(){ Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java =================================================================== diff -u -r9771e3b0f4bd5fa446d2c7b19604a958c1fb3aaa -r4a2728da7ea82a98b92d3a8b08feb6efa4023b7d --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java (.../UserManagementService.java) (revision 9771e3b0f4bd5fa446d2c7b19604a958c1fb3aaa) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java (.../UserManagementService.java) (revision 4a2728da7ea82a98b92d3a8b08feb6efa4023b7d) @@ -485,7 +485,7 @@ children.add(organisation); pOrg.setChildOrganisations(children); // get course managers and give them staff role in this new class - Vector managers = getUsersFromOrganisationByRole(pOrg.getOrganisationId(),Role.COURSE_MANAGER, false); + Vector managers = getUsersFromOrganisationByRole(pOrg.getOrganisationId(),Role.GROUP_MANAGER, false); for(UserDTO m: managers){ User user = (User)findById(User.class,m.getUserID()); UserOrganisation uo = new UserOrganisation(user,organisation); @@ -702,7 +702,7 @@ if (user.getWorkspace()==null) createWorkspaceForUser(user); } // when a user becomes group manager, they need monitor role in subgroups - if (role.getName().equals(Role.COURSE_MANAGER)) { + if (role.getName().equals(Role.GROUP_MANAGER)) { if (org.getOrganisationType().getOrganisationTypeId().equals(OrganisationType.COURSE_TYPE)) { setMonitorForGroupManager(user, org.getChildOrganisations()); } @@ -761,10 +761,10 @@ allRoles.remove(role); } if(!orgType.getOrganisationTypeId().equals(OrganisationType.COURSE_TYPE)) { - role.setRoleId(Role.ROLE_COURSE_MANAGER); + role.setRoleId(Role.ROLE_GROUP_MANAGER); allRoles.remove(role); if(!orgType.getOrganisationTypeId().equals(OrganisationType.ROOT_TYPE)) { - role.setRoleId(Role.ROLE_COURSE_ADMIN); + role.setRoleId(Role.ROLE_GROUP_ADMIN); allRoles.remove(role); } } @@ -808,6 +808,6 @@ public boolean isUserGlobalGroupAdmin() { Integer requestorId = ((UserDTO)SessionManager.getSession().getAttribute(AttributeNames.USER)).getUserID(); Integer rootOrgId = getRootOrganisation().getOrganisationId(); - return isUserInRole(requestorId, rootOrgId, Role.COURSE_ADMIN); + return isUserInRole(requestorId, rootOrgId, Role.GROUP_ADMIN); } } \ No newline at end of file