diff options
| author | Simon Rettberg | 2015-09-03 19:26:50 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2015-09-03 19:26:50 +0200 |
| commit | 807a103a58ae38975f03f13a70633b7406375976 (patch) | |
| tree | 4a7a9a4b110742b511e8472c7874c626715135c4 /dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ImageListViewer.java | |
| parent | [client] Fix NPE when deleting images while there are lectures with no image (diff) | |
| download | tutor-module-807a103a58ae38975f03f13a70633b7406375976.tar.gz tutor-module-807a103a58ae38975f03f13a70633b7406375976.tar.xz tutor-module-807a103a58ae38975f03f13a70633b7406375976.zip | |
[client] Show usable images by default, show admin images when selecting "show own"
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ImageListViewer.java')
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ImageListViewer.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ImageListViewer.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ImageListViewer.java index 67378cd1..a979f026 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ImageListViewer.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ImageListViewer.java @@ -55,7 +55,8 @@ public class ImageListViewer extends QLabel { private final RowFilter<ListModel<ImageSummaryRead>, Integer> filterOwn = new RowFilter<ListModel<ImageSummaryRead>, Integer>() { public boolean include(Entry<? extends ListModel<ImageSummaryRead>, ? extends Integer> entry) { - return imageTable.getModelRow(entry.getIdentifier()).ownerId.equals(Session.getUserId()); + ImageSummaryRead img = imageTable.getModelRow(entry.getIdentifier()); + return ImagePerms.canAdmin(img) || img.ownerId.equals(Session.getUserId()); } }; @@ -87,7 +88,7 @@ public class ImageListViewer extends QLabel { protected static enum FilterType { ALL("Alle anzeigen"), - OWN("Nur eigene Anzeigen"), + OWN("Nur eigene/zugewiesene Anzeigen"), USABLE("Nur verwendbare anzeigen"), EDITABLE("Nur editierbare anzeigen"), TEMPLATES("Nur Vorlagen zeigen"); @@ -168,6 +169,7 @@ public class ImageListViewer extends QLabel { applyFilterOnTable(); } }); + filterCbo.setSelectedItem(FilterType.USABLE); } /** @@ -185,7 +187,7 @@ public class ImageListViewer extends QLabel { FilterType filterType = (FilterType) filterCbo.getSelectedItem(); switch (filterType) { case ALL: - // no additional filters + // all.... break; case OWN: // filter for owner |