diff options
| author | Simon Rettberg | 2015-08-17 15:06:56 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2015-08-17 15:06:56 +0200 |
| commit | 8be02e60a4f3c3f2a90c84e61c3ce65c849bb30a (patch) | |
| tree | 4a8b9754f00df80bf45e39b1341eaf768fac10f8 /dozentenmodul/src/main/java | |
| parent | [client] Remove obsolete TODOs, debug output (diff) | |
| download | tutor-module-8be02e60a4f3c3f2a90c84e61c3ce65c849bb30a.tar.gz tutor-module-8be02e60a4f3c3f2a90c84e61c3ce65c849bb30a.tar.xz tutor-module-8be02e60a4f3c3f2a90c84e61c3ce65c849bb30a.zip | |
[client] ImagePerms.canEdit for ImageSummaryRead
Diffstat (limited to 'dozentenmodul/src/main/java')
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java | 2 | ||||
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/permissions/ImagePerms.java | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java index d3d975b9..26ef7bf4 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java @@ -293,7 +293,7 @@ public class ImageListWindow extends ImageListWindowLayout { // filter for editable RowFilter<Object, Object> filter = new RowFilter<Object, Object>() { public boolean include(Entry entry) { - return imageTable.getModelRow((Integer) entry.getIdentifier()).userPermissions.edit; + return ImagePerms.canEdit(imageTable.getModelRow((Integer) entry.getIdentifier())); } }; filters.add(filter); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/permissions/ImagePerms.java b/dozentenmodul/src/main/java/org/openslx/dozmod/permissions/ImagePerms.java index 4c6bf164..6899de05 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/permissions/ImagePerms.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/permissions/ImagePerms.java @@ -16,6 +16,11 @@ public class ImagePerms { && (image.userPermissions.admin || image.userPermissions.edit); } + public static boolean canEdit(ImageSummaryRead image) { + return image != null && image.userPermissions != null + && (image.userPermissions.admin || image.userPermissions.edit); + } + public static boolean canAdmin(ImageDetailsRead image) { return image != null && image.userPermissions != null && image.userPermissions.admin; } |