OO-4226: fix context in metadata editor of question pool

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;

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);