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

Merge remote-tracking branch 'origin/OpenOLAT_12.5'

parents 61237bf7 9574d772
No related branches found
No related tags found
No related merge requests found
......@@ -310,7 +310,7 @@ public class MembersMailController extends FormBasicController {
} else if (individualEl != null && !individualEl.isAtLeastSelected(1)) {
individualEl.setErrorKey("at.least.one.recipient", null);
} else if (externalEl != null && !externalEl.isAtLeastSelected(1)) {
individualEl.setErrorKey("at.least.one.recipient", null);
externalEl.setErrorKey("at.least.one.recipient", null);
}
}
......
......@@ -371,28 +371,28 @@ public class QuestionListController extends AbstractItemListController implement
private List<QuestionItemShort> getRemovableItems() {
return getItemsTable().getMultiSelectedIndex().stream()
.map(index -> getModel().getObject(index.intValue()))
.filter(itemRow -> itemRow.getSecurityCallback().canRemove())
.filter(itemRow -> itemRow != null && itemRow.getSecurityCallback().canRemove())
.collect(Collectors.toList());
}
private List<QuestionItemShort> getDeletableItems() {
return getItemsTable().getMultiSelectedIndex().stream()
.map(index -> getModel().getObject(index.intValue()))
.filter(itemRow -> itemRow.getSecurityCallback().canDelete())
.filter(itemRow -> itemRow != null && itemRow.getSecurityCallback().canDelete())
.collect(Collectors.toList());
}
private List<QuestionItemShort> getAuthorsEditableItems() {
return getItemsTable().getMultiSelectedIndex().stream()
.map(index -> getModel().getObject(index.intValue()))
.filter(itemRow -> itemRow.getSecurityCallback().canEditAuthors())
.filter(itemRow -> itemRow != null && itemRow.getSecurityCallback().canEditAuthors())
.collect(Collectors.toList());
}
private List<ItemRow> getMetadataEditableItems() {
return getItemsTable().getMultiSelectedIndex().stream()
.map(index -> getModel().getObject(index.intValue()))
.filter(itemRow -> itemRow.getSecurityCallback().canEditMetadata())
.filter(itemRow -> itemRow != null && itemRow.getSecurityCallback().canEditMetadata())
.collect(Collectors.toList());
}
......
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