From b7ef4edb93c45d0e77d18c25cb87a54276905997 Mon Sep 17 00:00:00 2001 From: Michael Wilson Date: Thu, 20 Nov 2014 18:08:08 +0100 Subject: Added Role Admin --- .../src/main/java/gui/intro/Login_GUI.java | 32 ++++------------------ 1 file changed, 5 insertions(+), 27 deletions(-) (limited to 'dozentenmodul/src/main/java/gui/intro/Login_GUI.java') diff --git a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java index 8afe4ace..99e7aae7 100644 --- a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java +++ b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java @@ -288,32 +288,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 @@ -391,9 +366,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(); -- cgit v1.2.3-55-g7522