Merge remote-tracking branch 'origin/OpenOLAT_14.1'

src/main/java/org/olat/course/nodes/gta/ui/GTACoachController.java

@@ -737,6 +737,11 @@ public class GTACoachController extends GTAAbstractController implements Assessm
 			submittedDocuments = documentsDir.listFiles(new SystemFilenameFilter(true, false));
 		}
 		
+		if(task == null && gtaNode.isOptional()) {
+			TaskProcess firstStep = gtaManager.firstStep(gtaNode);
+			task = gtaManager.createTask(null, taskList, firstStep, assessedGroup, assessedIdentity, gtaNode);
+		}
+		
 		int numOfDocs = submittedDocuments == null ? 0 : submittedDocuments.length;
 		task = gtaManager.collectTask(task, gtaNode, numOfDocs);
 		showInfo("run.documents.successfully.submitted");

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

@@ -97,10 +97,11 @@ public class HotspotEditorController extends FormBasicController {
 	private RichTextElement textEl;
 	private FileElement backgroundEl;
 	private SingleSelection resizeEl;
+	private FormLink newRectButton;
+	private FormLink newCircleButton;
 	private SingleSelection cardinalityEl;
 	private FormLayoutContainer hotspotsCont;
 	private MultipleSelectionElement responsiveEl;
-	private FormLink newCircleButton, newRectButton;
 	private MultipleSelectionElement correctHotspotsEl;
 	private SingleSelection layoutEl;
 	private MultipleSelectionElement shadowEl;
@@ -303,7 +304,7 @@ public class HotspotEditorController extends FormBasicController {
 
 		correctHotspotsEl.clearError();
 		if(!restrictedEdit && !readOnly) {
-			if(correctHotspotsEl.getSelectedKeys().size() == 0) {
+			if(correctHotspotsEl.getSelectedKeys().isEmpty()) {
 				correctHotspotsEl.setErrorKey("error.need.correct.answer", null);
 				allOk &= false;
 			}
@@ -345,7 +346,7 @@ public class HotspotEditorController extends FormBasicController {
 			createHotspotChoice(Shape.RECT, "50,50,100,100");
 			updateHotspots(ureq);
 		} else if(backgroundEl == source) {
-			//upload in itemDirectory;
+			// upload in item directory;
 			if(FileElementEvent.DELETE.equals(event.getCommand())) {
 				if(backgroundEl.getUploadFile() != null && backgroundEl.getUploadFile() != backgroundEl.getInitialFile()) {
 					backgroundEl.reset();
@@ -570,6 +571,8 @@ public class HotspotEditorController extends FormBasicController {
 	}
 	
 	private void optimizeResizeEl(Size size, boolean selectSize) {
+		if(size == null) return;
+		
 		List<String> keys = new ArrayList<>();
 		List<String> values = new ArrayList<>();