diff options
| author | Simon Rettberg | 2017-07-24 13:42:52 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2017-07-24 13:42:52 +0200 |
| commit | a72fff2a7f365e08efd16983457dcaf825b25162 (patch) | |
| tree | d7da6b071260204ca3081c8905150a8439920051 /dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java | |
| parent | [client] Support feature string supplied by server (diff) | |
| download | tutor-module-a72fff2a7f365e08efd16983457dcaf825b25162.tar.gz tutor-module-a72fff2a7f365e08efd16983457dcaf825b25162.tar.xz tutor-module-a72fff2a7f365e08efd16983457dcaf825b25162.zip | |
[client] Add support for Feature.EXTEND_EXPIRED_VM
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, 7 insertions, 1 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 2f2b381f..93b4faed 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 @@ -63,6 +63,7 @@ import org.openslx.dozmod.thrift.cache.UserCache; import org.openslx.dozmod.util.FormatHelper; import org.openslx.dozmod.util.MapHelper; import org.openslx.dozmod.util.OpenLinks; +import org.openslx.sat.thrift.version.Feature; import org.openslx.thrifthelper.ThriftManager; import org.openslx.util.QuickTimer; import org.openslx.util.QuickTimer.Task; @@ -321,7 +322,7 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe 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); + mnuExtendExpiryDate.setEnabled(!multiSelection && (selectedVersion.isValid || Session.hasFeature(Feature.EXTEND_EXPIRED_VM))); pop.show(e.getComponent(), e.getX(), e.getY()); } } @@ -618,6 +619,11 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe ThriftManager.getSatClient().setImageVersionExpiry(Session.getSatelliteToken(), img.versionId, Util.unixTime() + Session.getSatelliteConfig().maxImageValidityDays * 86400); + // Yes it's the same call twice to work around bug #3179 :-( + // TODO: Remove some time during 2018 + ThriftManager.getSatClient().setImageVersionExpiry(Session.getSatelliteToken(), + img.versionId, + Util.unixTime() + Session.getSatelliteConfig().maxImageValidityDays * 86400); count++; } catch (TException e) { ThriftError.showMessage(this, LOGGER, e, "Konnte Ablaufdatum der Version " + img.versionId |