1 files changed, 10 insertions, 8 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java
index c61b2764..5c4473b7 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java
@@ -31,7 +31,6 @@ public class ImageMetaDataPage extends ImageMetaDataPageLayout {
 		this.state = uploadWizardState;
 		setPageComplete(false);
 		// HACK set fixed uploadWizardState to test functions
-		uploadWizardState.isTemplate = false;
 		uploadWizardState.shareMode = ShareMode.LOCAL;
 
 		// fetch the OS list
@@ -77,18 +76,20 @@ public class ImageMetaDataPage extends ImageMetaDataPageLayout {
 				reactToUserInput();
 			}
 		});
-
-		setActiveCheck.setSelected(state.isEnabled);
-
 	}
 
 	@Override
 	protected void onPageEnter() {
 		LOGGER.debug("Entering page...");
 		// Preselect OS if possible
-		if (state.selectedOs == null && state.detectedOs != null) {
+		if (state.detectedOs != null) {
 			osCombo.setSelectedItem(state.detectedOs);
+		} else if (state.selectedOs == null) {
+			osCombo.setSelectedItem(null);
 		}
+		setActiveCheck.setSelected(state.isEnabled);
+		isTemplateCheck.setSelected(state.isTemplate);
+		licencedSoftwareCheck.setSelected(state.isRestricted);
 	}
 
 	@Override
@@ -98,6 +99,9 @@ public class ImageMetaDataPage extends ImageMetaDataPageLayout {
 				adminPermissionsCheck.isSelected());
 		state.selectedOs = (OperatingSystem)osCombo.getSelectedItem();
 		LOGGER.info("Selected OS is " + state.selectedOs);
+		state.isEnabled = setActiveCheck.isSelected();
+		state.isTemplate = isTemplateCheck.isSelected();
+		state.isRestricted = licencedSoftwareCheck.isSelected();
 		return state.selectedOs != null && state.description != null;
 	}
 
@@ -108,7 +112,6 @@ public class ImageMetaDataPage extends ImageMetaDataPageLayout {
 		for (OperatingSystem os : osList) {
 			osCombo.addItem(os);
 		}
-		// TODO: Select no OS by default
 	}
 
 	/**
@@ -117,14 +120,13 @@ public class ImageMetaDataPage extends ImageMetaDataPageLayout {
 	 * and call setPageComplete(bool) accordingly.
 	 */
 	private void reactToUserInput() {
-
 		if (osCombo.getSelectedIndex() == -1) {
 				// OS empty, description input present
 				setWarningMessage("Wählen Sie das Betriebssystem aus.");
 				setPageComplete(false);
 				return;
 		} 
-		
+		// evaluate description field
 		state.description = descriptionText.getText();
 		if (state.description == null || state.description.isEmpty()) {
 				// OS set, no description