[client] Fixed default permissions not beeing written at image creation.

2 files changed, 8 insertions, 6 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureOptionsPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureOptionsPageLayout.java
index b7f5657c..3db1bbf7 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureOptionsPageLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureOptionsPageLayout.java
@@ -36,7 +36,7 @@ public abstract class LectureOptionsPageLayout extends WizardPage {
 		grid.add(networkAccessCheck);
 		grid.nextRow();
 
-		autoUpdate = new JCheckBox("Aktuellste Imageversion verwenden", true);
+		autoUpdate = new JCheckBox("Immer auf aktuellste Imageversion updaten", true);
 		grid.add(autoUpdate);
 		grid.nextRow();
 
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java
index f27af40c..a2bbc405 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java
@@ -35,23 +35,25 @@ public class ImageCustomPermissionPage extends ImageCustomPermissionPageLayout {
 
 	@Override
 	protected void onPageEnter() {
-		if(!initDone){
-			imageCustomPermissionManager.initPanel(state.permissionMap, state.defaultPermissions, Session.getUserId());
+		if (!initDone) {
+			imageCustomPermissionManager.initPanel(state.permissionMap, state.defaultPermissions,
+					Session.getUserId());
 			initDone = true;
 		}
 	}
 
 	@Override
-	protected void onPageLeave() {
+	protected boolean wantNextOrFinish() {
 		LOGGER.debug("Saving permissions to state ...");
 		// saving the default permissions
 		state.defaultPermissions = new ImagePermissions(linkPermissionsCheck.isSelected(),
 				readPermissionsCheck.isSelected(), writePermissionsCheck.isSelected(),
 				adminPermissionsCheck.isSelected());
 		// save the table stuff to our upload wizard state
-		Map<String, ImagePermissions> newPermissionMap= imageCustomPermissionManager.updatePermissionReferences();
+		Map<String, ImagePermissions> newPermissionMap = imageCustomPermissionManager.updatePermissionReferences();
 		if (newPermissionMap == null || newPermissionMap.isEmpty())
-			return;
+			return super.wantNextOrFinish();
 		state.permissionMap = newPermissionMap;
+		return super.wantNextOrFinish();
 	}
 }