Skip to content
Snippets Groups Projects
Commit 59763717 authored by srosse's avatar srosse
Browse files

OO-3540: display the ID of the group in user management group chooser

parent a0c91ed2
No related branches found
No related tags found
No related merge requests found
...@@ -42,7 +42,7 @@ import org.olat.core.gui.components.form.flexible.impl.FormLayoutContainer; ...@@ -42,7 +42,7 @@ import org.olat.core.gui.components.form.flexible.impl.FormLayoutContainer;
import org.olat.core.gui.components.form.flexible.impl.elements.FormSubmit; import org.olat.core.gui.components.form.flexible.impl.elements.FormSubmit;
import org.olat.core.gui.components.form.flexible.impl.elements.MultipleSelectionElementImpl; import org.olat.core.gui.components.form.flexible.impl.elements.MultipleSelectionElementImpl;
import org.olat.core.gui.components.form.flexible.impl.elements.table.DefaultFlexiColumnModel; import org.olat.core.gui.components.form.flexible.impl.elements.table.DefaultFlexiColumnModel;
import org.olat.core.gui.components.form.flexible.impl.elements.table.FlexiColumnModel; import org.olat.core.gui.components.form.flexible.impl.elements.table.FlexiColumnDef;
import org.olat.core.gui.components.form.flexible.impl.elements.table.FlexiTableColumnModel; import org.olat.core.gui.components.form.flexible.impl.elements.table.FlexiTableColumnModel;
import org.olat.core.gui.components.form.flexible.impl.elements.table.FlexiTableDataModel; import org.olat.core.gui.components.form.flexible.impl.elements.table.FlexiTableDataModel;
import org.olat.core.gui.components.form.flexible.impl.elements.table.FlexiTableDataModelFactory; import org.olat.core.gui.components.form.flexible.impl.elements.table.FlexiTableDataModelFactory;
...@@ -139,12 +139,12 @@ public class GroupSearchController extends StepFormBasicController { ...@@ -139,12 +139,12 @@ public class GroupSearchController extends StepFormBasicController {
//group rights //group rights
FlexiTableColumnModel tableColumnModel = FlexiTableDataModelFactory.createFlexiTableColumnModel(); FlexiTableColumnModel tableColumnModel = FlexiTableDataModelFactory.createFlexiTableColumnModel();
tableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel(Cols.groupName.i18n(), Cols.groupName.ordinal())); tableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel(Cols.key));
tableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel(true, Cols.description.i18n(), Cols.description.ordinal(), tableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel(Cols.groupName));
false, null, FlexiColumnModel.ALIGNMENT_LEFT, new TextFlexiCellRenderer(EscapeMode.antisamy))); tableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel(Cols.description, new TextFlexiCellRenderer(EscapeMode.antisamy)));
tableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel(Cols.courses.i18n(), Cols.courses.ordinal())); tableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel(Cols.courses));
tableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel(Cols.tutor.i18n(), Cols.tutor.ordinal())); tableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel(Cols.tutor));
tableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel(Cols.participant.i18n(), Cols.participant.ordinal())); tableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel(Cols.participant));
tableDataModel = new GroupTableDataModel(Collections.<GroupWrapper>emptyList(), tableColumnModel); tableDataModel = new GroupTableDataModel(Collections.<GroupWrapper>emptyList(), tableColumnModel);
table = uifactory.addTableElement(getWindowControl(), "groupList", tableDataModel, getTranslator(), tableCont); table = uifactory.addTableElement(getWindowControl(), "groupList", tableDataModel, getTranslator(), tableCont);
...@@ -155,10 +155,7 @@ public class GroupSearchController extends StepFormBasicController { ...@@ -155,10 +155,7 @@ public class GroupSearchController extends StepFormBasicController {
saveLink = uifactory.addFormLink("save", formLayout, Link.BUTTON); saveLink = uifactory.addFormLink("save", formLayout, Link.BUTTON);
} }
} }
/**
* @see org.olat.core.gui.components.form.flexible.impl.FormBasicController#formOK(org.olat.core.gui.UserRequest)
*/
@Override @Override
protected void formOK(UserRequest ureq) { protected void formOK(UserRequest ureq) {
doSearchGroups(); doSearchGroups();
...@@ -414,6 +411,7 @@ public class GroupSearchController extends StepFormBasicController { ...@@ -414,6 +411,7 @@ public class GroupSearchController extends StepFormBasicController {
public Object getValueAt(int row, int col) { public Object getValueAt(int row, int col) {
GroupWrapper option = getObject(row); GroupWrapper option = getObject(row);
switch(Cols.values()[col]) { switch(Cols.values()[col]) {
case key: return option.getGroupKey();
case groupName: return option.getGroupName(); case groupName: return option.getGroupName();
case description: case description:
String description = option.getDescription(); String description = option.getDescription();
...@@ -433,7 +431,8 @@ public class GroupSearchController extends StepFormBasicController { ...@@ -433,7 +431,8 @@ public class GroupSearchController extends StepFormBasicController {
} }
} }
public static enum Cols { public static enum Cols implements FlexiColumnDef {
key("table.group.key"),
groupName("table.group.name"), groupName("table.group.name"),
description("description"), description("description"),
courses("table.header.resources"), courses("table.header.resources"),
...@@ -446,7 +445,8 @@ public class GroupSearchController extends StepFormBasicController { ...@@ -446,7 +445,8 @@ public class GroupSearchController extends StepFormBasicController {
this.i18n = i18n; this.i18n = i18n;
} }
public String i18n() { @Override
public String i18nHeaderKey() {
return i18n; return i18n;
} }
} }
......
...@@ -4,6 +4,7 @@ attende.and.owner=Besitzer und Teilnehmer ...@@ -4,6 +4,7 @@ attende.and.owner=Besitzer und Teilnehmer
group.removed=Diese Gruppe existiert nicht mehr\! group.removed=Diese Gruppe existiert nicht mehr\!
owner=Besitzer owner=Besitzer
table.group.name=Gruppenname table.group.name=Gruppenname
table.group.key=ID
table.group.type=Typ der Gruppe table.group.type=Typ der Gruppe
table.group.add.tutor=Hinzuf\u00fcgen als Betreuer table.group.add.tutor=Hinzuf\u00fcgen als Betreuer
table.group.add.participant=Hinzuf\u00fcgen als Teilnehmer table.group.add.participant=Hinzuf\u00fcgen als Teilnehmer
......
...@@ -21,6 +21,7 @@ send.email=Send invitational email ...@@ -21,6 +21,7 @@ send.email=Send invitational email
send.email.notif=Do you want to send a notification to the user? send.email.notif=Do you want to send a notification to the user?
table.group.add.participant=Add as participant table.group.add.participant=Add as participant
table.group.add.tutor=Add as coach table.group.add.tutor=Add as coach
table.group.key=ID
table.group.name=Group name table.group.name=Group name
table.group.type=Type of group table.group.type=Type of group
table.header.resources=$org.olat.group.ui.main\:table.header.resources table.header.resources=$org.olat.group.ui.main\:table.header.resources
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment