From 6122c71be4587c88c8feee9a60aa1034b64d0c7e Mon Sep 17 00:00:00 2001
From: Florian Gnaegi - frentix GmbH <gnaegi@frentix.com>
Date: Fri, 7 Mar 2014 14:14:08 +0100
Subject: [PATCH] OO-1008 add missing selection ordering to persisted editor
instance, remove bogus restricted edit mode
---
.../java/org/olat/ims/qti/editor/AssessmentController.java | 5 +++++
.../org/olat/ims/qti/editor/QTIEditorMainController.java | 3 ---
.../org/olat/ims/qti/editor/beecom/objects/Assessment.java | 1 +
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/olat/ims/qti/editor/AssessmentController.java b/src/main/java/org/olat/ims/qti/editor/AssessmentController.java
index 14e36cc5396..3e7f6a8cbc5 100644
--- a/src/main/java/org/olat/ims/qti/editor/AssessmentController.java
+++ b/src/main/java/org/olat/ims/qti/editor/AssessmentController.java
@@ -37,6 +37,7 @@ import org.olat.ims.qti.editor.beecom.objects.Assessment;
import org.olat.ims.qti.editor.beecom.objects.Control;
import org.olat.ims.qti.editor.beecom.objects.Duration;
import org.olat.ims.qti.editor.beecom.objects.OutcomesProcessing;
+import org.olat.ims.qti.editor.beecom.objects.SelectionOrdering;
/**
* Initial Date: Oct 21, 2004 <br>
@@ -68,6 +69,10 @@ public class AssessmentController extends TabbableDefaultController implements C
main = this.createVelocityContainer("tab_assess");
main.contextPut("assessment", assessment);
+ // fix missing selection ordering, new feature introduced in 9.3.3
+ if (assessment.getSelection_ordering() == null) {
+ assessment.setSelection_ordering(new SelectionOrdering());
+ }
main.contextPut("order_type", assessment.getSelection_ordering().getOrderType());
main.contextPut("selection_number", String.valueOf(assessment.getSelection_ordering().getSelectionNumber()));
main.contextPut("mediaBaseURL", qtiPackage.getMediaBaseURL());
diff --git a/src/main/java/org/olat/ims/qti/editor/QTIEditorMainController.java b/src/main/java/org/olat/ims/qti/editor/QTIEditorMainController.java
index 79439e7475f..a248c69b77e 100644
--- a/src/main/java/org/olat/ims/qti/editor/QTIEditorMainController.java
+++ b/src/main/java/org/olat/ims/qti/editor/QTIEditorMainController.java
@@ -265,9 +265,6 @@ public class QTIEditorMainController extends MainLayoutBasicController implement
break;
}
}
- if(CoordinatorManager.getInstance().getCoordinator().getLocker().isLocked(fileResource, null)) {
- restrictedEdit = true;
- }
this.referencees = referencees;
diff --git a/src/main/java/org/olat/ims/qti/editor/beecom/objects/Assessment.java b/src/main/java/org/olat/ims/qti/editor/beecom/objects/Assessment.java
index 37dc15fd27b..522075515e4 100644
--- a/src/main/java/org/olat/ims/qti/editor/beecom/objects/Assessment.java
+++ b/src/main/java/org/olat/ims/qti/editor/beecom/objects/Assessment.java
@@ -65,6 +65,7 @@ public class Assessment implements QTIObject {
setIdent(String.valueOf(CodeHelper.getRAMUniqueID()));
setTitle("New QTI Document");
getAssessmentcontrols().add(new Control());
+ setSelection_ordering(new SelectionOrdering());
}
public void addToElement(Element root) {
--
GitLab