From ecabc82fed05e51654201bf3f760fd551863b2fb Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Thu, 15 Aug 2013 15:53:46 +0200
Subject: [PATCH] OO-533: fix RS if the user hasn't selected an item to import
in a test
---
.../java/org/olat/modules/qpool/ui/ItemListController.java | 6 +++++-
.../org/olat/modules/qpool/ui/events/QItemViewEvent.java | 3 +++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/olat/modules/qpool/ui/ItemListController.java b/src/main/java/org/olat/modules/qpool/ui/ItemListController.java
index 0b594c3a87f..13e30a1469d 100644
--- a/src/main/java/org/olat/modules/qpool/ui/ItemListController.java
+++ b/src/main/java/org/olat/modules/qpool/ui/ItemListController.java
@@ -72,6 +72,10 @@ public class ItemListController extends AbstractItemListController {
@Override
protected void doSelect(UserRequest ureq, ItemRow row) {
- fireEvent(ureq, new QItemViewEvent("select-item", row));
+ if(row == null) {
+ showWarning("error.select.one");
+ } else {
+ fireEvent(ureq, new QItemViewEvent("select-item", row));
+ }
}
}
diff --git a/src/main/java/org/olat/modules/qpool/ui/events/QItemViewEvent.java b/src/main/java/org/olat/modules/qpool/ui/events/QItemViewEvent.java
index 2bfb6258dd7..214a43d575f 100644
--- a/src/main/java/org/olat/modules/qpool/ui/events/QItemViewEvent.java
+++ b/src/main/java/org/olat/modules/qpool/ui/events/QItemViewEvent.java
@@ -55,6 +55,9 @@ public class QItemViewEvent extends Event {
public List<QuestionItemView> getItemList() {
if(itemList == null) {
+ if(item == null) {
+ return Collections.emptyList();
+ }
return Collections.singletonList(item);
}
return itemList;
--
GitLab