summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/org/openslx/dozmod
diff options
context:
space:
mode:
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod')
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java2
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/permissions/ImagePerms.java5
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 6543d35d..335219fa 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;
}