Merge branch 'v1.1' of git.openslx.org:openslx-ng/tutor-module into v1.1

3 files changed, 12 insertions, 7 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java
index 4e43f1d7..323c0d58 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java
@@ -157,8 +157,6 @@ public class LoginWindow extends LoginWindowLayout {
 					if (current == null || !current.isSetEcpUrl() || current.getEcpUrl().isEmpty())
 						iterator.remove();
 				}
-				// all fine, lets sort it
-				Collections.sort(orgs, Sorters.organization);
 				// now send the organisations back to the LoginWindow
 				// through populateIdpCombo()
 				Gui.asyncExec(new Runnable() {
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/state/UploadWizardState.java b/dozentenmodul/src/main/java/org/openslx/dozmod/state/UploadWizardState.java
index d0e46d03..c340f562 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/state/UploadWizardState.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/state/UploadWizardState.java
@@ -9,6 +9,7 @@ import org.openslx.bwlp.thrift.iface.ShareMode;
 import org.openslx.bwlp.thrift.iface.TransferInformation;
 import org.openslx.dozmod.filetransfer.AsyncHashGenerator;
 import org.openslx.dozmod.filetransfer.UploadTask;
+import org.openslx.dozmod.thrift.Session;
 import org.openslx.util.vm.VmMetaData;
 
 public class UploadWizardState {
@@ -26,8 +27,7 @@ public class UploadWizardState {
 	// disk file of the virtual machine to be uploaded
 	public File diskFile = null;
 	// permissions assigned to that image by the user
-	// TODO: defaults per sat
-	public ImagePermissions defaultPermissions = null;
+	public ImagePermissions defaultPermissions = Session.getSatelliteConfig().getDefaultImagePermissions();
 	// explicit permissions per user as set by the creator
 	public Map<String, ImagePermissions> permissionMap = null;
 	// local, publish, download frozen share mode
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/cache/OrganizationCache.java b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/cache/OrganizationCache.java
index 69e48552..2c224006 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/cache/OrganizationCache.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/cache/OrganizationCache.java
@@ -1,10 +1,12 @@
 package org.openslx.dozmod.thrift.cache;
 
+import java.util.Collections;
 import java.util.List;
 
 import org.apache.log4j.Logger;
 import org.openslx.bwlp.thrift.iface.Organization;
 import org.openslx.bwlp.thrift.iface.UserInfo;
+import org.openslx.dozmod.thrift.Sorters;
 import org.openslx.thrifthelper.ThriftManager;
 import org.openslx.util.GenericDataCache;
 import org.openslx.util.GenericDataCache.CacheMode;
@@ -23,15 +25,20 @@ public class OrganizationCache {
 
 		@Override
 		protected List<Organization> update() throws Exception {
+			List<Organization> orgs = null;
 			try {
-				return ThriftManager.getMasterClient().getOrganizations();
+				orgs = ThriftManager.getMasterClient().getOrganizations();
+				Collections.sort(orgs, Sorters.organization);
+				return orgs;
 			} catch (Exception e) {
 				LOGGER.warn(
 						"Failed to get organization list from master server, trying satellite for backup..",
 						e);
 			}
-			return ThriftManager.getSatClient().getAllOrganizations();
-			// TODO: Sort list by display name?
+			orgs = ThriftManager.getSatClient().getAllOrganizations();
+			Collections.sort(orgs, Sorters.organization);
+			return orgs;
+			// TODO: Sort list by display name? (Check whether ok)
 		}
 	};