From c0934ea61ae968986f0308dd68a0d3d46e8ae7bf Mon Sep 17 00:00:00 2001
From: ralph isenmann
Date: Wed, 26 Jan 2022 16:19:57 +0100
Subject: [CLIENT] fix isPageValid check for container

---
 .../dozmod/gui/wizard/page/LectureImageListPage.java | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'dozentenmodul/src')

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureImageListPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureImageListPage.java
index b00bfbd7..a9e7676f 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureImageListPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureImageListPage.java
@@ -16,6 +16,7 @@ import org.openslx.dozmod.permissions.ImagePerms;
 import org.openslx.dozmod.state.LectureWizardState;
 import org.openslx.dozmod.thrift.cache.ImageCache;
 import org.openslx.dozmod.util.ContainerUtils;
+import org.openslx.thrifthelper.TConst;
 import org.openslx.util.QuickTimer;
 import org.openslx.util.QuickTimer.Task;
 
@@ -91,16 +92,19 @@ public class LectureImageListPage extends LectureImageListPageLayout {
 
 	private boolean isPageValid() {
 		ImageSummaryRead selected = imageTable.getSelectedItem();
-		if (ContainerUtils.isContainerImageLinked(selected)) {
-			setErrorMessage(I18n.PAGE.getString("LectureImageList.WizardPage.errorMessage.containerLinkedWithLecture"));
-			return false;
-		}
-		else if (ContainerUtils.isDataContainer(selected)) {
-			setErrorMessage(I18n.PAGE.getString("LectureImageList.WizardPage.errorMessage.imageIsDataContainer"));
-			return false;
+
+		if (selected != null && selected.virtId.equals(TConst.VIRT_DOCKER)) {
+			if (ContainerUtils.isContainerImageLinked(selected)) {
+				setErrorMessage(I18n.PAGE.getString("LectureImageList.WizardPage.errorMessage.containerLinkedWithLecture"));
+				return false;
+			}
+			else if (ContainerUtils.isDataContainer(selected)) {
+				setErrorMessage(I18n.PAGE.getString("LectureImageList.WizardPage.errorMessage.imageIsDataContainer"));
+				return false;
+			}
 		}
 
-		else if (selected != null && selected.isValid && ImagePerms.canLink(selected)) {
+		if (selected != null && selected.isValid && ImagePerms.canLink(selected)) {
 			state.image = selected;
 			state.imageVersionId = selected.getLatestVersionId();
 			setDescription(I18n.PAGE.getString("LectureImageList.WizardPage.description"));
-- 
cgit v1.2.3-55-g7522