[client] Set default permissions in wizards with perms from satellite config.

2 files changed, 4 insertions, 7 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 6df1b7c0..971c0471 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
@@ -7,7 +7,6 @@ import javax.swing.JOptionPane;
 import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
 import org.openslx.bwlp.thrift.iface.ImageBaseWrite;
-import org.openslx.bwlp.thrift.iface.ImagePermissions;
 import org.openslx.bwlp.thrift.iface.ImageVersionWrite;
 import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.helper.MessageType;
@@ -39,8 +38,8 @@ public class ImageCreationWizard extends Wizard implements UiFeedback {
 	 */
 	public ImageCreationWizard(Window parent) {
 		super(parent);
-		// TODO get default from server?
-		uploadWizardState.defaultPermissions = new ImagePermissions(true, true, false, false);
+		uploadWizardState.defaultPermissions = Session.getSatelliteConfig().defaultImagePermissions;
+
 		imageUploadPage = new ImageUploadPage(this, uploadWizardState, null);
 		imageMetaDataPage = new ImageMetaDataPage(this, uploadWizardState);
 		imageCustomPermissionPage = new ImageCustomPermissionPage(this, uploadWizardState);
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/LectureWizard.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/LectureWizard.java
index b914e5b3..fa1ca5f6 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/LectureWizard.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/LectureWizard.java
@@ -6,7 +6,6 @@ import javax.swing.JOptionPane;
 
 import org.apache.log4j.Logger;
 import org.openslx.bwlp.thrift.iface.ImageSummaryRead;
-import org.openslx.bwlp.thrift.iface.LecturePermissions;
 import org.openslx.bwlp.thrift.iface.LectureWrite;
 import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.MainWindow;
@@ -18,6 +17,7 @@ import org.openslx.dozmod.gui.wizard.page.LectureCustomPermissionPage;
 import org.openslx.dozmod.gui.wizard.page.LectureImageListPage;
 import org.openslx.dozmod.gui.wizard.page.LectureOptionsPage;
 import org.openslx.dozmod.state.LectureWizardState;
+import org.openslx.dozmod.thrift.Session;
 import org.openslx.dozmod.thrift.ThriftActions;
 import org.openslx.dozmod.thrift.cache.LectureCache;
 
@@ -43,9 +43,7 @@ public class LectureWizard extends Wizard implements UiFeedback {
 			state.image = image;
 			state.imageVersionId = imageVersionId;
 		}
-		
-		//TODO get default from server?
-		state.defaultPermissions = new LecturePermissions(false, false);
+		state.defaultPermissions = 	Session.getSatelliteConfig().defaultLecturePermissions;
 		
 		// create the shared object for all pages of the wizard
 		addPage(new LectureCreationPage(this, state));