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

OO-4331: only show the name of the track file

parent cb9c1d23
No related branches found
No related tags found
No related merge requests found
...@@ -83,9 +83,9 @@ public class VideoTrackEditController extends FormBasicController { ...@@ -83,9 +83,9 @@ public class VideoTrackEditController extends FormBasicController {
formLayout.add(generalCont); formLayout.add(generalCont);
FlexiTableColumnModel columnsModel = FlexiTableDataModelFactory.createFlexiTableColumnModel(); FlexiTableColumnModel columnsModel = FlexiTableDataModelFactory.createFlexiTableColumnModel();
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(true, TrackTableCols.file.i18nKey(), TrackTableCols.file.ordinal(), true, TrackTableCols.file.name())); columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(TrackTableCols.file));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(TrackTableCols.language.i18nKey(), TrackTableCols.language.ordinal(), true, TrackTableCols.language.name())); columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(TrackTableCols.language));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(true, TrackTableCols.delete.i18nKey(), TrackTableCols.delete.ordinal(),false, TrackTableCols.delete.name())); columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(TrackTableCols.delete));
tableModel = new VideoTracksTableModel(columnsModel, getLocale()); tableModel = new VideoTracksTableModel(columnsModel, getLocale());
tableEl = uifactory.addTableElement(getWindowControl(), "tracks", tableModel, getTranslator(), generalCont); tableEl = uifactory.addTableElement(getWindowControl(), "tracks", tableModel, getTranslator(), generalCont);
......
...@@ -22,6 +22,7 @@ package org.olat.modules.video.ui; ...@@ -22,6 +22,7 @@ package org.olat.modules.video.ui;
import java.util.Locale; import java.util.Locale;
import org.olat.core.gui.components.form.flexible.impl.elements.table.DefaultFlexiTableDataModel; import org.olat.core.gui.components.form.flexible.impl.elements.table.DefaultFlexiTableDataModel;
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.FlexiTableColumnModel;
/** /**
...@@ -50,14 +51,14 @@ public class VideoTracksTableModel extends DefaultFlexiTableDataModel<TrackTable ...@@ -50,14 +51,14 @@ public class VideoTracksTableModel extends DefaultFlexiTableDataModel<TrackTable
public Object getValueAt(int row, int col) { public Object getValueAt(int row, int col) {
TrackTableRow track = getObject(row); TrackTableRow track = getObject(row);
switch(TrackTableCols.values()[col]) { switch(TrackTableCols.values()[col]) {
case file: return track.getTrack(); case file: return track.getTrack() == null ? "-" : track.getTrack().getName();
case language: return new Locale(track.getLanguage()).getDisplayLanguage(locale); case language: return new Locale(track.getLanguage()).getDisplayLanguage(locale);
case delete: return track.getDeleteLink(); case delete: return track.getDeleteLink();
default: return ""; default: return "";
} }
} }
public enum TrackTableCols { public enum TrackTableCols implements FlexiSortableColumnDef {
file("track.table.header.file"), file("track.table.header.file"),
language("track.table.header.language"), language("track.table.header.language"),
delete("track.table.header.delete"); delete("track.table.header.delete");
...@@ -68,8 +69,19 @@ public class VideoTracksTableModel extends DefaultFlexiTableDataModel<TrackTable ...@@ -68,8 +69,19 @@ public class VideoTracksTableModel extends DefaultFlexiTableDataModel<TrackTable
this.i18nKey = i18nKey; this.i18nKey = i18nKey;
} }
public String i18nKey() { @Override
public String i18nHeaderKey() {
return i18nKey; return i18nKey;
} }
@Override
public boolean sortable() {
return true;
}
@Override
public String sortKey() {
return name();
}
} }
} }
\ No newline at end of file
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