OO-4242: remove curriculum if feature disabled

src/main/java/org/olat/course/assessment/ui/mode/AssessmentModeEditController.java

@@ -41,6 +41,7 @@ import org.olat.core.gui.components.form.flexible.impl.FormBasicController;
 import org.olat.core.gui.components.form.flexible.impl.FormEvent;
 import org.olat.core.gui.components.form.flexible.impl.FormLayoutContainer;
 import org.olat.core.gui.components.link.Link;
+import org.olat.core.gui.components.util.KeyValues;
 import org.olat.core.gui.control.Controller;
 import org.olat.core.gui.control.Event;
 import org.olat.core.gui.control.WindowControl;
@@ -239,31 +240,28 @@ public class AssessmentModeEditController extends FormBasicController {
 		}
 		startModeEl.setEnabled(status != Status.end);
 		
-		String[] audienceKeys = new String[] {
-			AssessmentMode.Target.courseAndGroups.name(),
-			AssessmentMode.Target.course.name(),
-			AssessmentMode.Target.groups.name(),
-			AssessmentMode.Target.curriculumEls.name()
-		};
-		String[] audienceValues = new String[] {
-			translate("target.courseAndGroups"),
-			translate("target.course"),
-			translate("target.groups"),
-			translate("target.curriculumElements")
-		};
-		targetEl = uifactory.addRadiosVertical("audience", "mode.target", formLayout, audienceKeys, audienceValues);
+		KeyValues targetKeyValues = new KeyValues();
+		boolean curriculumEnabled = curriculumModule.isEnabled();
+		String allLabel = curriculumEnabled ? translate("target.courseGroupsAndCurriculums") : translate("target.courseAndGroups");
+		targetKeyValues.add(KeyValues.entry(AssessmentMode.Target.courseAndGroups.name(), allLabel));
+		targetKeyValues.add(KeyValues.entry(AssessmentMode.Target.course.name(), translate("target.course")));
+		targetKeyValues.add(KeyValues.entry(AssessmentMode.Target.groups.name(), translate("target.groups")));
+		if(curriculumEnabled) {
+			targetKeyValues.add(KeyValues.entry(AssessmentMode.Target.curriculumEls.name(), translate("target.curriculumElements")));
+		}
+		targetEl = uifactory.addRadiosVertical("audience", "mode.target", formLayout, targetKeyValues.keys(), targetKeyValues.values());
 		targetEl.setElementCssClass("o_sel_assessment_mode_audience");
 		targetEl.setEnabled(status != Status.end);
 		Target target = assessmentMode.getTargetAudience();
 		if(target != null) {
-			for(String audienceKey:audienceKeys) {
+			for(String audienceKey:targetKeyValues.keys()) {
 				if(audienceKey.equals(target.name())) {
 					targetEl.select(audienceKey, true);
 				}
 			}
 		}
 		if(!targetEl.isOneSelected()) {
-			targetEl.select(audienceKeys[0], true);
+			targetEl.select(targetKeyValues.keys()[0], true);
 		}
 		//choose groups / curriculum
 		String groupPage = velocity_root + "/choose_groups.html";
@@ -277,7 +275,7 @@ public class AssessmentModeEditController extends FormBasicController {
 		chooseAreasButton.setEnabled(status != Status.end);
 		chooseCurriculumElementsButton = uifactory.addFormLink("choose.curriculum.elements", chooseGroupsCont, Link.BUTTON);
 		chooseCurriculumElementsButton.setEnabled(status != Status.end);
-		chooseCurriculumElementsButton.setVisible(curriculumModule.isEnabled());
+		chooseCurriculumElementsButton.setVisible(curriculumEnabled);
 
 		groupKeys = new ArrayList<>();
 		groupNames = new ArrayList<>();

src/main/java/org/olat/course/assessment/ui/mode/_i18n/LocalStrings_de.properties

@@ -110,7 +110,8 @@ table.header.externalId=$org.olat.repository\:table.header.externalid
 table.header.externalRef=$org.olat.repository\:table.header.externalref
 table.header.status=Status
 table.header.target=F\u00FCr
-target.courseAndGroups=Teilnehmer aus Kurs, Gruppen und Curriculum
+target.courseAndGroups=Teilnehmer aus Kurs, Gruppen
+target.courseGroupsAndCurriculums=Teilnehmer aus Kurs, Gruppen und Curriculum
 target.curriculumElements=Nur Curriculumteilnehmer
 target.groups=Nur Gruppenteilnehmer
 target.course=Nur Kursteilnehmer

src/main/java/org/olat/course/assessment/ui/mode/_i18n/LocalStrings_en.properties

@@ -112,7 +112,8 @@ table.header.status=Status
 table.header.target=For
 target.course=Course participants only
 target.curriculumElements=Curriculum participants only
-target.courseAndGroups=Participants from course, groups and curriculums
+target.courseGroups=Participants from course, groups
+target.courseGroupsAndCurriculums=Participants from course, groups and curriculums
 target.groups=Group participants only
 time.formatted={0}m
 warning.missing.element=One or more configured course elements cannot be found in course. Please check the restrictions of the course element.

src/main/java/org/olat/course/assessment/ui/mode/_i18n/LocalStrings_fr.properties

@@ -112,6 +112,7 @@ table.header.status=Statut
 table.header.target=Pour
 target.course=Seulement les participants du cours
 target.courseAndGroups=Participants du cours et des groupes
+target.courseGroupsAndCurriculums=Participants du cours et des groupes et curriculums
 target.curriculumElements=Participants de curriculum seulement
 target.groups=Participants des groupes uniquement
 time.formatted={0}m