From 8be02e60a4f3c3f2a90c84e61c3ce65c849bb30a Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Mon, 17 Aug 2015 15:06:56 +0200 Subject: [client] ImagePerms.canEdit for ImageSummaryRead --- .../src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java | 2 +- .../src/main/java/org/openslx/dozmod/permissions/ImagePerms.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'dozentenmodul/src/main/java') 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 filter = new RowFilter() { 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; } -- cgit v1.2.3-55-g7522