Skip to content
Snippets Groups Projects
Commit ab5878f6 authored by srosse's avatar srosse
Browse files

OO-4748: a group configured for enrollment can be deleted

parent a110e1c0
No related branches found
No related tags found
No related merge requests found
......@@ -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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment