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

src/main/java/org/olat/group/ui/main/EditMembershipController.java

@@ -47,6 +47,7 @@ import org.olat.core.gui.components.form.flexible.impl.elements.table.DefaultFle
 import org.olat.core.gui.components.form.flexible.impl.elements.table.FlexiCellRenderer;
 import org.olat.core.gui.components.form.flexible.impl.elements.table.FlexiColumnDef;
 import org.olat.core.gui.components.form.flexible.impl.elements.table.FlexiColumnModel;
+import org.olat.core.gui.components.form.flexible.impl.elements.table.FlexiSortableColumnDef;
 import org.olat.core.gui.components.form.flexible.impl.elements.table.FlexiTableColumnModel;
 import org.olat.core.gui.components.form.flexible.impl.elements.table.FlexiTableComponent;
 import org.olat.core.gui.components.form.flexible.impl.elements.table.FlexiTableDataModelFactory;
@@ -386,6 +387,8 @@ public class EditMembershipController extends FormBasicController {
 		} else {
 			curriculumTableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel(CurriculumCols.curriculumElement, new CurriculumElementIndentRenderer()));
 		}
+
+		curriculumTableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel(CurriculumCols.curriculumElementIdentifier));
 		curriculumTableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel(CurriculumCols.owner));
 		curriculumTableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel(CurriculumCols.coach));
 		curriculumTableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel(CurriculumCols.participant));
@@ -675,11 +678,12 @@ public class EditMembershipController extends FormBasicController {
 			switch(CurriculumCols.values()[col]) {
 				case curriculum: return option.getElement().getCurriculum().getDisplayName();
 				case curriculumElement: return option.getElement().getDisplayName();
+				case curriculumElementIdentifier: return option.getElement().getIdentifier();
 				case owner: return option.getOwner();
 				case coach: return option.getCoach();
 				case participant: return option.getParticipant();
+				default: return "ERROR";
 			}
-			return null;
 		}
 
 		@Override
@@ -749,9 +753,10 @@ public class EditMembershipController extends FormBasicController {
 	}
 	
 	
-	public static enum CurriculumCols implements FlexiColumnDef {
+	public enum CurriculumCols implements FlexiSortableColumnDef {
 		curriculum("table.header.curriculum"),
 		curriculumElement("table.header.curriculum.element"),
+		curriculumElementIdentifier("table.header.identifier"),
 		owner("table.header.owners"),
 		coach("table.header.tutors"),
 		participant("table.header.participants");
@@ -766,9 +771,19 @@ public class EditMembershipController extends FormBasicController {
 		public String i18nHeaderKey() {
 			return i18n;
 		}
+
+		@Override
+		public boolean sortable() {
+			return false;
+		}
+
+		@Override
+		public String sortKey() {
+			return name();
+		}
 	}
 	
-	public static enum GroupCols implements FlexiColumnDef {
+	public enum GroupCols implements FlexiColumnDef {
 		groupName("table.header.groups"),
 		tutorCount("table.header.tutorsCount"),
 		participantCount("table.header.participantsCount"),

src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_de.properties

@@ -186,6 +186,7 @@ table.header.graduate=Zulassen
 tbl_graduate=$:table.header.graduate
 table.header.firstName=Vorname
 table.header.lastName=Name
+table.header.identifier=Bezeichnung
 table.header.mail=E-Mail
 table.header.firstTime=Beitritt
 table.header.lastTime=Zuletzt besucht

src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_en.properties

@@ -160,6 +160,7 @@ table.header.freePlaces=Slots
 table.header.graduate=Admit
 table.header.group.full=Full
 table.header.groups=Group
+table.header.identifier=Identifier
 table.header.key=ID
 table.header.lastName=Lastname
 table.header.lastTime=Last visit

src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_fr.properties

@@ -160,6 +160,7 @@ table.header.freePlaces=Places
 table.header.graduate=Promouvoir
 table.header.group.full=Plein
 table.header.groups=Groupes
+table.header.identifier=Identifiant
 table.header.key=ID
 table.header.lastName=Nom
 table.header.lastTime=Derni\u00E8re visite

src/main/java/org/olat/modules/lecture/ui/AbstractTeacherOverviewController.java

@@ -298,9 +298,6 @@ public abstract class AbstractTeacherOverviewController extends BasicController
 		} else if(searchCtrl == source) {
 			if(event instanceof SearchLecturesBlockEvent) {
 				doSearch((SearchLecturesBlockEvent)event);
-			} else if(event == Event.CANCELLED_EVENT) {
-				currentSearchParams = new LecturesBlockSearchParameters();
-				loadModel(currentSearchParams);
 			}
 		}
 		super.event(ureq, source, event);

src/main/java/org/olat/modules/lecture/ui/TeacherOverviewSearchController.java

@@ -30,7 +30,6 @@ import org.olat.core.gui.components.form.flexible.elements.TextElement;
 import org.olat.core.gui.components.form.flexible.impl.FormBasicController;
 import org.olat.core.gui.components.form.flexible.impl.FormLayoutContainer;
 import org.olat.core.gui.control.Controller;
-import org.olat.core.gui.control.Event;
 import org.olat.core.gui.control.WindowControl;
 import org.olat.core.gui.control.generic.dtabs.Activateable2;
 import org.olat.core.id.context.ContextEntry;
@@ -167,7 +166,7 @@ public class TeacherOverviewSearchController extends FormBasicController impleme
 		searchEl.setValue(null);
 		startEl.setDate(defaultStartDate);
 		endEl.setDate(defaultEndDate);
-		fireEvent(ureq, Event.CANCELLED_EVENT);
+		doSearch(ureq);
 	}
 	
 	private void doSearch(UserRequest ureq) {