From 1a2b7a9149a860c5ee0da34ce5f67dd9fcc28bf2 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Thu, 27 Oct 2016 13:17:51 +0200
Subject: [client] disable "extend image expiry date" again until the server
 supports it correctly

---
 .../java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java   | 9 +++++----
 1 file changed, 5 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 ce04e35e..c70532a5 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
@@ -264,7 +264,6 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 		if (Session.canExtendImageExpiry()) {
 			pop.addSeparator();
 			pop.addMenuItem(mnuExtendExpiryDate);
-			mnuExtendExpiryDate.setEnabled(true);
 		}
 
 		// keyboard shortcut
@@ -314,13 +313,15 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 					}
 					if (e.isPopupTrigger()) {
 						boolean multiSelection = tblVersions.getSelectedRowCount() != 1;
-						mnuNewLecture.setEnabled(!multiSelection && tblVersions.getSelectedItem().isValid
+						ImageVersionDetails selectedVersion = tblVersions.getSelectedItem();
+						mnuNewLecture.setEnabled(!multiSelection && selectedVersion.isValid
 								&& ImagePerms.canLink(image));
-						mnuDownload.setEnabled(!multiSelection && tblVersions.getSelectedItem().isValid
+						mnuDownload.setEnabled(!multiSelection && selectedVersion.isValid
 								&& ImagePerms.canDownload(image));
-						mnuVmConfig.setEnabled(!multiSelection && tblVersions.getSelectedItem().isValid
+						mnuVmConfig.setEnabled(!multiSelection && selectedVersion.isValid
 								&& ImagePerms.canEdit(image) && (image.shareMode == ShareMode.LOCAL || image.shareMode == ShareMode.PUBLISH));
 						mnuDelete.setEnabled(ImagePerms.canEdit(image));
+						mnuExtendExpiryDate.setEnabled(!multiSelection && selectedVersion.isValid);
 						pop.show(e.getComponent(), e.getX(), e.getY());
 					}
 				}
-- 
cgit v1.2.3-55-g7522