Revert "SAK-49150 Gradebook TA not in group, but with permission to g…

…rade a group, cannot actually grade (#12589)"

This reverts commit 30c295a.

gradebookng/tool/src/java/org/sakaiproject/gradebookng/business/GradebookNgBusinessService.java

@@ -1795,7 +1795,6 @@ public List<GbStudentGradeInfo> sortGradeMatrix(Map<String, GbStudentGradeInfo>
 	 */
 	public List<GbGroup> getSiteSectionsAndGroups() {
 		final String siteId = getCurrentSiteId();
-		final String userId = getCurrentUser().getId();
 
 		final List<GbGroup> rval = new ArrayList<>();
 
@@ -1810,22 +1809,7 @@ public List<GbGroup> getSiteSectionsAndGroups() {
 		// get groups (handles both groups and sections)
 		try {
 			final Site site = this.siteService.getSite(siteId);
-
-			final List<PermissionDefinition> perms = getPermissionsForUser(userId, siteId);
-
-			List<String> groupReferences = perms.stream().map(PermissionDefinition::getGroupReference).filter(Objects::nonNull).collect(Collectors.toList());
-
-			final Collection<Group> groups;
-
-			if (GbRole.INSTRUCTOR.equals(role)) {
-				groups = site.getGroups();
-			} else {
-				if (!groupReferences.isEmpty()) {
-					groups = site.getGroups().stream().filter(group -> groupReferences.contains(group.getReference())).collect(Collectors.toList());
-				} else {
-					groups = site.getGroupsWithMember(userDirectoryService.getCurrentUser().getId());
-				}
-			}
+			final Collection<Group> groups = isSuperUser() || role == GbRole.INSTRUCTOR ? site.getGroups() : site.getGroupsWithMember(userDirectoryService.getCurrentUser().getId());
 
 			for (final Group group : groups) {
 				rval.add(new GbGroup(group.getId(), group.getTitle(), group.getReference(), GbGroup.Type.GROUP));