Merge OpenOLAT 12.2 to OpenOLAT default branch with 3d5e47b745d54d662f4aef4f1e5de0e5c1bceeea

.hgtags

@@ -192,6 +192,7 @@ dda2b6a8c3454872516fac37667698425802fc97 OpenOLAT 11.5.1
 614f0f09f5a7a915a3a364e3f5641e9179dc7735 OpenOLAT 12.0.0
 03f92c40a74397b179cce2b4b2d3346c29a20e64 OpenOLAT 12.0.1
 9266c599d0a13634e44724540a37fb4161e29f98 OpenOLAT 11.5.4
+362aa1c29fa5cde07960ac648098ddf4c6f19ed7 OpenOLAT 11.5.5
 15761fa18b4b2eebe3e4592e4289527989c7f256 OpenOLAT 12.0.2
 cd13b2d55dde9f3f3ba9f31e10f9d02493740891 OpenOLAT 12.1.0
 cd13b2d55dde9f3f3ba9f31e10f9d02493740891 OpenOLAT 12.1.0

src/main/java/org/olat/ims/qti21/ui/editor/interactions/HottextEditorController.java

@@ -156,10 +156,12 @@ public class HottextEditorController extends FormBasicController {
 		if(readOnly) return;
 		//title
 		itemBuilder.setTitle(titleEl.getValue());
-		//set the question with the text entries
-		String questionText = textEl.getRawValue();
-		itemBuilder.setQuestion(questionText);
-
+		
+		if(!restrictedEdit) {
+			//set the question with the text entries
+			String questionText = textEl.getRawValue();
+			itemBuilder.setQuestion(questionText);
+		}
 		fireEvent(ureq, new AssessmentItemEvent(AssessmentItemEvent.ASSESSMENT_ITEM_CHANGED, itemBuilder.getAssessmentItem(), QTI21QuestionType.hottext));
 	}
 	

src/main/java/org/olat/ims/qti21/ui/editor/interactions/MatchEditorController.java

@@ -346,6 +346,8 @@ public class MatchEditorController extends FormBasicController {
 	}
 	
 	private void commitAssociations(UserRequest ureq) {
+		if(restrictedEdit) return;
+		
 		temporaryAssociations.clear();
 		itemBuilder.clearAssociations();