From b9e7391fafaf41a7b38368ad7a4054639672dd2d Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Thu, 5 Sep 2019 17:11:56 +0200
Subject: [PATCH] OO-4226: fix context in metadata editor of question pool
---
.../olat/modules/qpool/model/QEducationalContext.java | 9 +++------
.../qpool/ui/metadata/GeneralMetadataEditController.java | 6 +++---
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/olat/modules/qpool/model/QEducationalContext.java b/src/main/java/org/olat/modules/qpool/model/QEducationalContext.java
index 053e51a0986..c2eaaecefb9 100644
--- a/src/main/java/org/olat/modules/qpool/model/QEducationalContext.java
+++ b/src/main/java/org/olat/modules/qpool/model/QEducationalContext.java
@@ -25,7 +25,6 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
-import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
import javax.persistence.Temporal;
@@ -44,11 +43,9 @@ import org.olat.core.id.Persistable;
*/
@Entity(name="qeducontext")
@Table(name="o_qp_edu_context")
-@NamedQueries({
- @NamedQuery(name="loadQEduContexts", query="select educontext from qeducontext educontext"),
- @NamedQuery(name="loadQEduContextById", query="select educontext from qeducontext educontext where educontext.key=:contextKey"),
- @NamedQuery(name="loadQEduContextByLevel", query="select educontext from qeducontext educontext where educontext.level=:level")
-})
+@NamedQuery(name="loadQEduContexts", query="select educontext from qeducontext educontext")
+@NamedQuery(name="loadQEduContextById", query="select educontext from qeducontext educontext where educontext.key=:contextKey")
+@NamedQuery(name="loadQEduContextByLevel", query="select educontext from qeducontext educontext where educontext.level=:level")
public class QEducationalContext implements CreateInfo, Persistable {
private static final long serialVersionUID = 7688819263188243303L;
diff --git a/src/main/java/org/olat/modules/qpool/ui/metadata/GeneralMetadataEditController.java b/src/main/java/org/olat/modules/qpool/ui/metadata/GeneralMetadataEditController.java
index 2a74e3a2ecf..6c39c37246c 100644
--- a/src/main/java/org/olat/modules/qpool/ui/metadata/GeneralMetadataEditController.java
+++ b/src/main/java/org/olat/modules/qpool/ui/metadata/GeneralMetadataEditController.java
@@ -106,8 +106,8 @@ public class GeneralMetadataEditController extends FormBasicController {
contexts.getKeys(), contexts.getValues(), null);
contextEl.setAllowNoSelection(true);
contextEl.setEnabled(contexts.getKeys().length > 0);
- if (StringHelper.containsNonWhitespace(item.getEducationalContextLevel())) {
- contextEl.select(item.getEducationalContextLevel(), true);
+ if (item.getEducationalContext() != null) {
+ contextEl.select(item.getEducationalContext().getKey().toString(), true);
}
contextEl.setVisible(qPoolSecurityCallback.canUseEducationalContext());
@@ -248,7 +248,7 @@ public class GeneralMetadataEditController extends FormBasicController {
}
QEducationalContext context = contextEl.isOneSelected()
- ? qpoolService.getEducationlContextByLevel(contextEl.getSelectedKey())
+ ? MetaUIFactory.getContextByKey(contextEl.getSelectedKey(), qpoolService)
: null;
itemImpl.setEducationalContext(context);
--
GitLab