diff options
| author | Simon Rettberg | 2018-12-11 10:47:17 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2018-12-11 10:47:17 +0100 |
| commit | ee74f04fe01b32cdd5a859730a78f19e7e01a938 (patch) | |
| tree | ec9f667f44ddf3c5051ce510b55a1ebc9714572d /dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java | |
| parent | [*] Follow changes in m-s-s to load/save predef netshare/filters (diff) | |
| download | tutor-module-ee74f04fe01b32cdd5a859730a78f19e7e01a938.tar.gz tutor-module-ee74f04fe01b32cdd5a859730a78f19e7e01a938.tar.xz tutor-module-ee74f04fe01b32cdd5a859730a78f19e7e01a938.zip | |
Revert "[client] Get rid of Feature checks; RPC version was bumped"
This reverts commit b9f993161d7a8472e82f2c747c2361a3ba411b6a.
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java')
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java | 8 |
1 files changed, 5 insertions, 3 deletions
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 241656f6..1dacf8df 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 @@ -66,6 +66,7 @@ import org.openslx.dozmod.thrift.cache.MetaDataCache; import org.openslx.dozmod.thrift.cache.UserCache; import org.openslx.dozmod.util.DesktopEnvironment; import org.openslx.dozmod.util.FormatHelper; +import org.openslx.sat.thrift.version.Feature; import org.openslx.thrifthelper.Comparators; import org.openslx.thrifthelper.TConst; import org.openslx.thrifthelper.ThriftManager; @@ -324,7 +325,8 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe && ImagePerms.canEdit(image) && (image.shareMode == ShareMode.LOCAL || image.shareMode == ShareMode.PUBLISH)); mnuDelete.setEnabled(ImagePerms.canEdit(image)); - mnuExtendExpiryDate.setEnabled(!multiSelection && selectedVersion.isValid); + mnuExtendExpiryDate.setEnabled(!multiSelection && (selectedVersion.isValid + || Session.hasFeature(Feature.EXTEND_EXPIRED_VM))); pop.show(e.getComponent(), e.getX(), e.getY()); } } @@ -491,8 +493,8 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe * masterserver. */ private void uploadToMaster() { - // TODO 04.2018: bail if we the user tries to publish a non-vmware image. - if (!TConst.VIRT_VMWARE.equals(image.virtId)) { + // 04.2018: bail if we the user tries to publish a non-vmware image. + if (Session.hasFeature(Feature.MULTIPLE_HYPERVISORS) && !TConst.VIRT_VMWARE.equals(image.virtId)) { Gui.showMessageBox( MetaDataCache.getVirtualizerById(image.virtId).virtName + " ist derzeit nicht für den öffentlichen Austausch freigegeben.", |