From ab5878f68ab495aa3d5421a59ae65e3decc674a6 Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Fri, 19 Jun 2020 07:23:02 +0200
Subject: [PATCH] OO-4748: a group configured for enrollment can be deleted
---
.../course/nodes/en/ENEditGroupAreaFormController.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/olat/course/nodes/en/ENEditGroupAreaFormController.java b/src/main/java/org/olat/course/nodes/en/ENEditGroupAreaFormController.java
index 7d6693993c3..40dbee1311b 100644
--- a/src/main/java/org/olat/course/nodes/en/ENEditGroupAreaFormController.java
+++ b/src/main/java/org/olat/course/nodes/en/ENEditGroupAreaFormController.java
@@ -187,12 +187,13 @@ class ENEditGroupAreaFormController extends FormBasicController implements Gener
List<EnrollmentRow> enrollmentRows = enrollmentManager.getEnrollments(getIdentity(), groupKeys, null, 256);
Map<Long,EnrollmentRow> enrollmentMap = enrollmentRows.stream().collect(Collectors.toMap(EnrollmentRow::getKey, g -> g, (u, v) -> u));
- easyGroupTableRows = new ArrayList<ENEditGroupTableContentRow>();
+ easyGroupTableRows = new ArrayList<>();
for (Long groupKey : groupKeys) {
BusinessGroup group = groupMap.get(groupKey);
- EnrollmentRow enrollment = enrollmentMap.get(groupKey);
-
- easyGroupTableRows.add(new ENEditGroupTableContentRow(group, enrollment));
+ if(group != null) {
+ EnrollmentRow enrollment = enrollmentMap.get(groupKey);
+ easyGroupTableRows.add(new ENEditGroupTableContentRow(group, enrollment));
+ }
}
easyGroupTableModel.setObjects(easyGroupTableRows);
--
GitLab