Merge OpenOLAT-11.5.x to OpenOLAT-default with 1ef79e4d257dd705eb39abedb74af50e4ad59e20

.hgtags

@@ -186,3 +186,4 @@ aa02a5383a846d9b76620693f1713cc1f7a5c3b7 OpenOLAT 11.3.0
 ddfe863807617f21f6d75216bed144c791f5cab1 OpenOLAT 11.4.2
 25a2dc4dba8a7961ff4f19e33f709ddea5949141 OpenOLAT 11.4.3
 f0de363ab794a6e0d6f4d6da57f460503d5dfa91 OpenOLAT 11.5.0
+dda2b6a8c3454872516fac37667698425802fc97 OpenOLAT 11.5.1

src/main/java/org/olat/course/nodes/pf/manager/PFManager.java

@@ -530,7 +530,9 @@ public class PFManager {
 		Set<Identity> identitySet = new HashSet<>();
 		RepositoryEntry re = courseEnv.getCourseGroupManager().getCourseEntry();
 		if(admin) {
-			return repositoryEntryRelationDao.getMembers(re, RepositoryEntryRelationType.both, GroupRoles.participant.name());
+			List<Identity> participants = repositoryEntryRelationDao.getMembers(re, RepositoryEntryRelationType.both, GroupRoles.participant.name());
+			// deduplicate list (participants from groups and direct course membership)
+			identitySet.addAll(participants);
 		} else {
 			if(repositoryService.hasRole(id, re, GroupRoles.coach.name())) {
 				List<Identity> identities = repositoryService.getMembers(re, GroupRoles.participant.name());