Skip to content
Snippets Groups Projects
Commit 6122c71b authored by Florian Gnaegi - frentix GmbH's avatar Florian Gnaegi - frentix GmbH
Browse files

OO-1008 add missing selection ordering to persisted editor instance, remove...

OO-1008 add missing selection ordering to persisted editor instance, remove bogus restricted edit mode
parent 01276f34
No related branches found
No related tags found
No related merge requests found
...@@ -37,6 +37,7 @@ import org.olat.ims.qti.editor.beecom.objects.Assessment; ...@@ -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.Control;
import org.olat.ims.qti.editor.beecom.objects.Duration; 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.OutcomesProcessing;
import org.olat.ims.qti.editor.beecom.objects.SelectionOrdering;
/** /**
* Initial Date: Oct 21, 2004 <br> * Initial Date: Oct 21, 2004 <br>
...@@ -68,6 +69,10 @@ public class AssessmentController extends TabbableDefaultController implements C ...@@ -68,6 +69,10 @@ public class AssessmentController extends TabbableDefaultController implements C
main = this.createVelocityContainer("tab_assess"); main = this.createVelocityContainer("tab_assess");
main.contextPut("assessment", assessment); 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("order_type", assessment.getSelection_ordering().getOrderType());
main.contextPut("selection_number", String.valueOf(assessment.getSelection_ordering().getSelectionNumber())); main.contextPut("selection_number", String.valueOf(assessment.getSelection_ordering().getSelectionNumber()));
main.contextPut("mediaBaseURL", qtiPackage.getMediaBaseURL()); main.contextPut("mediaBaseURL", qtiPackage.getMediaBaseURL());
......
...@@ -265,9 +265,6 @@ public class QTIEditorMainController extends MainLayoutBasicController implement ...@@ -265,9 +265,6 @@ public class QTIEditorMainController extends MainLayoutBasicController implement
break; break;
} }
} }
if(CoordinatorManager.getInstance().getCoordinator().getLocker().isLocked(fileResource, null)) {
restrictedEdit = true;
}
this.referencees = referencees; this.referencees = referencees;
......
...@@ -65,6 +65,7 @@ public class Assessment implements QTIObject { ...@@ -65,6 +65,7 @@ public class Assessment implements QTIObject {
setIdent(String.valueOf(CodeHelper.getRAMUniqueID())); setIdent(String.valueOf(CodeHelper.getRAMUniqueID()));
setTitle("New QTI Document"); setTitle("New QTI Document");
getAssessmentcontrols().add(new Control()); getAssessmentcontrols().add(new Control());
setSelection_ordering(new SelectionOrdering());
} }
public void addToElement(Element root) { public void addToElement(Element root) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment