[client] set default permissions from sat, sort organizations in cache.

1 files changed, 10 insertions, 3 deletions

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)
 		}
 	};