diff options
| author | Simon Rettberg | 2018-12-07 16:13:59 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2018-12-07 16:13:59 +0100 |
| commit | b9f993161d7a8472e82f2c747c2361a3ba411b6a (patch) | |
| tree | 539d1ffc8524584775e2e72194785f1cbade8626 /dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java | |
| parent | [server] ImageSummary: Fill fileSizeSum and versionCount (diff) | |
| download | tutor-module-b9f993161d7a8472e82f2c747c2361a3ba411b6a.tar.gz tutor-module-b9f993161d7a8472e82f2c747c2361a3ba411b6a.tar.xz tutor-module-b9f993161d7a8472e82f2c747c2361a3ba411b6a.zip | |
[client] Get rid of Feature checks; RPC version was bumped
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, 3 insertions, 5 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 b254b379..212e92b0 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 @@ -65,7 +65,6 @@ 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,8 +323,7 @@ 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 - || Session.hasFeature(Feature.EXTEND_EXPIRED_VM))); + mnuExtendExpiryDate.setEnabled(!multiSelection && selectedVersion.isValid); pop.show(e.getComponent(), e.getX(), e.getY()); } } @@ -492,8 +490,8 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe * masterserver. */ private void uploadToMaster() { - // 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)) { + // TODO 04.2018: bail if we the user tries to publish a non-vmware image. + if (!TConst.VIRT_VMWARE.equals(image.virtId)) { Gui.showMessageBox( MetaDataCache.getVirtualizerById(image.virtId).virtName + " ist derzeit nicht für den öffentlichen Austausch freigegeben.", |