Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java =================================================================== RCS file: /usr/local/cvsroot/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java,v diff -u -r1.20 -r1.21 --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java 13 Jan 2012 07:44:13 -0000 1.20 +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java 2 Jul 2012 18:41:16 -0000 1.21 @@ -451,9 +451,11 @@ boolean marksReleased = lesson.getMarksReleased() != null && lesson.getMarksReleased(); // Dont include lesson in list if the user doesnt have permission + Integer organisationToCheckPermission = (organisation.getParentOrganisation() == null) + ? organisation.getOrganisationId() : organisation.getParentOrganisation().getOrganisationId(); if (!(view == GBGridView.MON_COURSE && (lesson.getLessonClass().isStaffMember(user) || userService.isUserInRole(user - .getUserId(), organisation.getOrganisationId(), Role.GROUP_MANAGER)) || view == GBGridView.LRN_COURSE + .getUserId(), organisationToCheckPermission, Role.GROUP_MANAGER)) || view == GBGridView.LRN_COURSE && lesson.getAllLearners().contains(user) && marksReleased)) { continue; }