diff options
| author | Manuel Bentele | 2021-03-10 11:31:17 +0100 |
|---|---|---|
| committer | Manuel Bentele | 2021-03-11 07:46:19 +0100 |
| commit | f82250cf9f206509f8c59a3016536f5e9314f44d (patch) | |
| tree | afff56fd83c1481f59779290f0890faf473443a3 | |
| parent | [server] Fix warnings and replace deprecated methods (diff) | |
| download | tutor-module-f82250cf9f206509f8c59a3016536f5e9314f44d.tar.gz tutor-module-f82250cf9f206509f8c59a3016536f5e9314f44d.tar.xz tutor-module-f82250cf9f206509f8c59a3016536f5e9314f44d.zip | |
[client] Disable VM configuration for Docker containers
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java | 14 |
1 files changed, 4 insertions, 10 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 fe342b36..bad9cea0 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 @@ -58,7 +58,6 @@ import org.openslx.thrifthelper.TConst; import org.openslx.thrifthelper.ThriftManager; import org.openslx.util.QuickTimer; import org.openslx.util.QuickTimer.Task; -import org.openslx.util.ThriftUtil; import org.openslx.util.Util; /** @@ -306,9 +305,11 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout mnuNewLecture.setEnabled( !multiSelection && selectedVersion.isValid && ImagePerms.canLink(image)); mnuDownload.setEnabled(!multiSelection && ImagePerms.canDownload(image)); + // Allow configuration edition for downloaded VMs for now + // Docker images can not be edited since configuration menu for containers does not exist mnuVmConfig.setEnabled( !multiSelection && selectedVersion.isValid && ImagePerms.canEdit( - image)); // Allow VMX edition for downloaded VMs for now + image ) && !TConst.VIRT_DOCKER.equals(image.getVirtId())); mnuDelete.setEnabled(ImagePerms.canEdit(image)); mnuExtendExpiryDate.setEnabled( !multiSelection && (selectedVersion.isValid || Session.hasFeature( @@ -406,14 +407,7 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout return; } - String tmp = ThriftUtil.byteBufferToString(machineDescription); - if (TConst.VIRT_QEMU.equals(image.virtId)) { - VirtConfigEditorWindow.open(me, actionHandler, selected.versionId, - ThriftUtil.byteBufferToString(machineDescription), tmp); - } else { - VirtDropDownConfigEditorWindow.open(me, actionHandler, selected.versionId, - machineDescription); - } + VirtDropDownConfigEditorWindow.open(me, actionHandler, selected.versionId, machineDescription); } }); } |