Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module

1 files changed, 5 insertions, 27 deletions

diff --git a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
index a84175d5..561f826f 100644
--- a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
@@ -289,32 +289,7 @@ public class Login_GUI extends JFrame {
 		
 		if (loginType == LOGIN_TYPE_BWLEHRPOOL) {
 			
-			/*
-			//offline mode in case the masterserver is not reachable. start programm with parameter: offline_mode
-			if(args.length != 0 && args[0].equals("offline_mode"))
-			{
-				SessionData.session.setServerAdress("141.79.128.102");
-				System.out.println("Entering in offline_mode");
-				String hochschule = "testhochschule.de";
-
-				person.verantwortlicher.setUsername("max.mustermann@"+hochschule);
-				person.verantwortlicher.setUserID("max.mustermann@"+hochschule);
-				person.verantwortlicher.setName("Max");
-				person.verantwortlicher.setVorname("Mustermann");
-				person.verantwortlicher.setEMail("max.mustermann@"+hochschule);
-				person.verantwortlicher.setHochschule(hochschule);
-				
-				person.verantwortlicher.setRole("Dozent");
-				//person.verantwortlicher.setRole("Student");
-				
-				ThriftConnection bwthrift = new ThriftConnection();
-				server.generated.Server.Client bwClient = bwthrift.getThriftConnection();
-				models.Client.clientcon.setClient(bwClient);
-				
-			}
-			else
-			{
-			*/
+			
 			// start the authentication process against the masterserver
 			org.openslx.imagemaster.thrift.iface.SessionData result = null;
 			// Connect to Master
@@ -393,9 +368,12 @@ public class Login_GUI extends JFrame {
 			person.verantwortlicher.setHochschule(hochschule);
 
 			// Spaeter ueber result.getRole zum Beispiel die Rolle holen
-			 
+			if(lblusername.getText().trim().startsWith("admin@")){
+				person.verantwortlicher.setRole("Admin");
+			} else { 
 			person.verantwortlicher.setRole("Dozent");
 			//person.verantwortlicher.setRole("Student");
+			}
 			
 			showMainMenu();