Merge OpenOLAT 10.4 to OpenOLAT 10.5 with 6957bb96821ee7a69f4bb181b143d5b95974bea2

src/main/java/org/olat/core/commons/fullWebApp/BaseFullWebappController.java

@@ -1352,15 +1352,17 @@ public class BaseFullWebappController extends BasicController implements DTabs,
 			userToolsMenuCtrl.lock();
 		}
 		
-		for(int i=dtabsControllers.size(); i-->0; ) {
-			DTab tab = dtabs.get(i);
-			if(lockResource == null
-					|| !lockResource.getResourceableId().equals(tab.getOLATResourceable().getResourceableId())) {
-				removeDTab(null, tab);
-			} else if (lockResource != null
-					&& lockResource.getResourceableId().equals(tab.getOLATResourceable().getResourceableId())
-					&& lockStatus != LockStatus.locked) {
-				removeDTab(null, tab);
+		if(dtabsControllers != null) {
+			for(int i=dtabsControllers.size(); i-->0; ) {
+				DTab tab = dtabs.get(i);
+				if(lockResource == null
+						|| !lockResource.getResourceableId().equals(tab.getOLATResourceable().getResourceableId())) {
+					removeDTab(null, tab);
+				} else if (lockResource != null
+						&& lockResource.getResourceableId().equals(tab.getOLATResourceable().getResourceableId())
+						&& lockStatus != LockStatus.locked) {
+					removeDTab(null, tab);
+				}
 			}
 		}
 		navSitesVc.contextPut("visible", Boolean.FALSE);

src/main/java/org/olat/course/nodes/GTACourseNode.java

@@ -569,7 +569,7 @@ public class GTACourseNode extends AbstractAccessableCourseNode implements Asses
 				+ "_" + assessedIdentity.getKey();
 		
 		Task task = gtaManager.getTask(assessedIdentity, taskList);
-		if(task != null && config.getBooleanSafe(GTASK_ASSIGNMENT)) {
+		if(task != null && task.getTaskName() != null && config.getBooleanSafe(GTASK_ASSIGNMENT)) {
 			File taskDirectory = gtaManager.getTasksDirectory(course.getCourseEnvironment(), this);
 			File taskFile = new File(taskDirectory, task.getTaskName());
 			if(taskFile.exists()) {
@@ -614,7 +614,7 @@ public class GTACourseNode extends AbstractAccessableCourseNode implements Asses
 				+ "_" + businessGroup.getKey();
 		
 		Task task = gtaManager.getTask(businessGroup, taskList);
-		if(task != null && config.getBooleanSafe(GTASK_ASSIGNMENT)) {
+		if(task != null && task.getTaskName() != null && config.getBooleanSafe(GTASK_ASSIGNMENT)) {
 			File taskDirectory = gtaManager.getTasksDirectory(course.getCourseEnvironment(), this);
 			File taskFile = new File(taskDirectory, task.getTaskName());
 			if(taskFile.exists()) {

src/main/java/org/olat/course/nodes/cl/ui/CheckListRunController.java

@@ -348,6 +348,10 @@ public class CheckListRunController extends FormBasicController implements Contr
 			return checkboxEl.getName();
 		}
 		
+		public boolean hasDownload() {
+			return StringHelper.containsNonWhitespace(checkbox.getFilename()) && downloadLink != null;
+		}
+		
 		public String getDownloadName() {
 			return downloadLink.getComponent().getComponentName();
 		}

src/main/java/org/olat/course/nodes/cl/ui/CheckboxAssessmentController.java

@@ -203,7 +203,7 @@ public class CheckboxAssessmentController extends FormBasicController {
 			TextElement pointEl = uifactory.addTextElement(name + "point", null, 5, pointVal, formLayout);
 			pointEl.setDisplaySize(5);
 			
-			MultipleSelectionElement checkEl = uifactory.addCheckboxesHorizontal(name + "check", formLayout, onKeys, onValues);
+			MultipleSelectionElement checkEl = uifactory.addCheckboxesHorizontal(name + "check", null, formLayout, onKeys, onValues);
 			checkEl.setDomReplacementWrapperRequired(false);
 			checkEl.addActionListener(FormEvent.ONCHANGE);
 			checkEl.setUserObject(row);

src/main/java/org/olat/course/nodes/cl/ui/_content/run.html

@@ -153,7 +153,7 @@
 				#if($checkbox.description)
 					<div class="o_cl_desc">$r.xssScan($checkbox.description)</div>
 				#end
-				#if($checkbox.checkbox.filename)
+				#if(${checkbox.hasDownload()})
 					<div class="o_cl_file">$r.render($checkbox.downloadName)</div>
 				#end
 			</div>

src/main/java/org/olat/course/nodes/ta/DropboxForm.java

@@ -77,7 +77,8 @@ public class DropboxForm extends FormBasicController {
 	protected void formOK(UserRequest ureq) {
 		fireEvent (ureq, Event.DONE_EVENT);
 	}
-	
+
+	@Override
 	protected void formInnerEvent (UserRequest ureq, FormItem source, FormEvent event) {
 		if (source == enablemail) {
 			confirmation.setMandatory (enablemail.isSelected(0));
@@ -112,7 +113,9 @@ public class DropboxForm extends FormBasicController {
 		confirmation = uifactory.addTextAreaElement("confirmation", "form.dropbox.confirmation", 2500, 4, 40, true, sConfirmation != null ? sConfirmation : "", formLayout);
 		
 		Boolean enableMail = (Boolean)config.get(TACourseNode.CONF_DROPBOX_ENABLEMAIL);
-		confirmation.setMandatory(enableMail);
+		if(enableMail != null) {
+			confirmation.setMandatory(enableMail.booleanValue());
+		}
 		enablemail = uifactory.addCheckboxesHorizontal("enablemail", "form.dropbox.enablemail", formLayout, new String[]{"xx"}, new String[]{null});
 		enablemail.select("xx", enableMail != null ? enableMail.booleanValue() : true);
 		enablemail.addActionListener(FormEvent.ONCLICK);

src/main/java/org/olat/user/propertyhandlers/_i18n/LocalStrings_de.properties

@@ -259,13 +259,13 @@ form.group.address=Adresse
 form.group.contact=Kontaktdaten
 form.group.institute=Institution
 form.group.person=Person
-form.group.about=ber mich
+form.group.about=\u00DCber mich
 form.group.officeaddress=Gesch\u00E4ftsadresse
 form.name.birthDay=Geburtsdatum
 form.name.birthDay.error=Bitte geben Sie ein g\u00FCltiges Datum an.
 form.name.birthDay.error.empty=Das Feld "Geburtsdatum" darf nicht leer sein.
-form.name.date.future.error=Das gewhlte Datum muss in der Zukunft liegen
-form.name.date.past.error=Das gewhlte Datum muss in der Vergangenheit liegen
+form.name.date.future.error=Das gew\u00E4hlte Datum muss in der Zukunft liegen
+form.name.date.past.error=Das gew\u00E4hlte Datum muss in der Vergangenheit liegen
 form.name.city=Stadt
 form.name.city.error.empty=Das Feld "Stadt" darf nicht leer sein.
 form.name.country=Land
@@ -427,5 +427,5 @@ text.element.error.notlongerthan=Wert enth\u00E4lt mehr wie {0} Zeichen
 username=Benutzername
 yph.from=Von
 yph.to=Bis
-yph.err=Bitte geben Sie einen gltigen Wert ein
-yph.infomsg=Bitte geben Sie 'von' und 'bis' Jahreszahlen (JJJJ) ein. <br />Sie knnen auch '+N' oder '-N' verwenden...
+yph.err=Bitte geben Sie einen g\u00FCltigen Wert ein
+yph.infomsg=Bitte geben Sie 'von' und 'bis' Jahreszahlen (JJJJ) ein. <br />Sie k\u00F6nnen auch '+N' oder '-N' verwenden...
\ No newline at end of file