Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageAction.java =================================================================== diff -u -r15e10e04c8ed121dcf87859d994bc2a3f96cfac7 -r7e663c388f1d40c36911265891d1e688ea3da620 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageAction.java (.../UserManageAction.java) (revision 15e10e04c8ed121dcf87859d994bc2a3f96cfac7) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageAction.java (.../UserManageAction.java) (revision 7e663c388f1d40c36911265891d1e688ea3da620) @@ -110,12 +110,12 @@ // check permission if(request.isUserInRole(Role.SYSADMIN)){ request.setAttribute("canAdd",true); - }else if(!getService().isUserInRole(userId,orgOfCourseAdmin.getOrganisationId(),Role.COURSE_ADMIN)){ + }else if(getService().isUserInRole(userId,orgOfCourseAdmin.getOrganisationId(),Role.COURSE_ADMIN) || getService().isUserInRole(userId,orgOfCourseAdmin.getOrganisationId(),Role.COURSE_MANAGER)){ + request.setAttribute("canAdd",orgOfCourseAdmin.getCourseAdminCanAddNewUsers()); + }else{ errors.add("authorisation",new ActionMessage("error.authorisation")); saveErrors(request,errors); return mapping.findForward("error"); - }else{ - request.setAttribute("canAdd",orgOfCourseAdmin.getCourseAdminCanAddNewUsers()); } // get list of users in org