From 3c2b1dc3274ea070017f0e09231ca25bc0264253 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Fri, 9 Sep 2016 18:02:50 +0200 Subject: [client] respect ShareMode of the image when en/disabling popup menu items. And removed unneeded code. --- .../main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'dozentenmodul/src/main/java') diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java index 1536be16..9f20e645 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java @@ -317,7 +317,7 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe mnuDownload.setEnabled(!multiSelection && tblVersions.getSelectedItem().isValid && ImagePerms.canDownload(image)); mnuVmConfig.setEnabled(!multiSelection && tblVersions.getSelectedItem().isValid - && ImagePerms.canEdit(image)); + && ImagePerms.canEdit(image) && (image.shareMode == ShareMode.LOCAL || image.shareMode == ShareMode.PUBLISH)); mnuDelete.setEnabled(ImagePerms.canEdit(image)); mnuExtendExpiryDate.setEnabled(multiSelection || tblVersions.getSelectedItem().isValid); @@ -727,9 +727,7 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe // set the versions of the image to the table tblVersions.setData(image.getVersions(), true); - mnuDelete.setEnabled(ImagePerms.canAdmin(image)); - mnuDownload.setEnabled(ImagePerms.canDownload(image)); - mnuNewLecture.setEnabled(ImagePerms.canAdmin(image)); + // make fields editable is allowed makeEditable(true); // finally do show it all -- cgit v1.2.3-55-g7522