diff --git a/src/main/java/org/olat/commons/memberlist/ui/MembersMailController.java b/src/main/java/org/olat/commons/memberlist/ui/MembersMailController.java index 36991712fe650a7ab387095a9bef8401563009a7..4d30126b52cc733971c04bf3cb6cc57b7d3d8126 100644 --- a/src/main/java/org/olat/commons/memberlist/ui/MembersMailController.java +++ b/src/main/java/org/olat/commons/memberlist/ui/MembersMailController.java @@ -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); } } diff --git a/src/main/java/org/olat/modules/qpool/ui/QuestionListController.java b/src/main/java/org/olat/modules/qpool/ui/QuestionListController.java index f70f947f6c35c01ce8816f4dc9277e9d0c0b59a2..686128aedfc4994547b6058fff7e4905120b87a5 100644 --- a/src/main/java/org/olat/modules/qpool/ui/QuestionListController.java +++ b/src/main/java/org/olat/modules/qpool/ui/QuestionListController.java @@ -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()); }