summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorralph isenmann2021-03-18 17:49:05 +0100
committerralph isenmann2021-03-18 17:49:05 +0100
commit544c7def05cf04c4862b86ccf0d664c4beebd5fd (patch)
tree81241da6650ccb53d40afef49e0f5e5fedeedfec
parent[client] Fix not showing warning Message (diff)
downloadtutor-module-544c7def05cf04c4862b86ccf0d664c4beebd5fd.tar.gz
tutor-module-544c7def05cf04c4862b86ccf0d664c4beebd5fd.tar.xz
tutor-module-544c7def05cf04c4862b86ccf0d664c4beebd5fd.zip
[client] Add Check for docker_container feature
if Sat has this feature enabled, show additional Pages in ImageCreationWizard for container image creation
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java
index 55ef788b..cb40b0f5 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java
@@ -15,6 +15,7 @@ import org.openslx.dozmod.thrift.Session;
import org.openslx.dozmod.thrift.ThriftActions;
import org.openslx.dozmod.thrift.ThriftError;
import org.openslx.dozmod.thrift.UploadInitiator.GotUploadTokenCallback;
+import org.openslx.sat.thrift.version.Feature;
import org.openslx.thrifthelper.ThriftManager;
import org.openslx.util.QuickTimer;
import org.openslx.util.QuickTimer.Task;
@@ -50,7 +51,12 @@ public class ImageCreationWizard extends Wizard
super(parent);
state.defaultPermissions = Session.getSatelliteConfig().defaultImagePermissions;
- addPage(new ImageTypePage(this));
+ if (Session.hasFeature(Feature.DOCKER_CONTAINER)) {
+ addPage(new ImageTypePage(this));
+ }
+ else {
+ doVmCreation();
+ }
}
/**