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

1 files changed, 11 insertions, 11 deletions

diff --git a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
index 7180650e..cb783a59 100644
--- a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
@@ -119,13 +119,7 @@ public class SearchLecture_GUI extends JFrame {
 	 * Create the dialog.

 	 */

 	public SearchLecture_GUI(Component formerGUI) {

-		

-		try {

-			client.setTokenForSession(SessionData.session.getAuthToken());

-		} catch (TException e1) {

-			// TODO Auto-generated catch block

-			e1.printStackTrace();

-		}

+

 		

 		filters.add(RowFilter.regexFilter(".", 0));

 		rf = RowFilter.orFilter(filters);

@@ -136,6 +130,12 @@ public class SearchLecture_GUI extends JFrame {
 			public void windowClosing(WindowEvent arg0) {

 				// Beendet die Anwendung nach klick auf X

 				con.closeThriftConnection();

+				try {

+					client.setSessionInvalid(SessionData.session.getAuthToken());

+				} catch (TException e) {

+					// TODO Auto-generated catch block

+					e.printStackTrace();

+				}

 				System.exit(0);

 			}

 			@Override

@@ -633,10 +633,10 @@ public class SearchLecture_GUI extends JFrame {
 			// Hole eine Liste der erlaubten Images für die diese Person

 			if(person.verantwortlicher.getRole()=="Admin"){

 				//get complete list

-				lectures = client.getLectureList();

+				lectures = client.getLectureList(SessionData.session.getAuthToken());

 			} else {

 				//get permitted list			

-				lectures = client.getLectureListPermissionRead(person.verantwortlicher.getUserID());

+				lectures = client.getLectureListPermissionRead(SessionData.session.getAuthToken());

 			}

 			

 			Iterator<server.generated.Lecture> i = lectures.iterator();

@@ -677,7 +677,7 @@ public class SearchLecture_GUI extends JFrame {
 		try {

 			// Hole eine Liste der erlaubten Images für die diese Person

 			//lectures = client.getLectureList();

-			lectures = client.getLectureList();

+			lectures = client.getLectureList(SessionData.session.getAuthToken());

 			Iterator<server.generated.Lecture> i = lectures.iterator();

 			SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

 			SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");

@@ -730,7 +730,7 @@ public class SearchLecture_GUI extends JFrame {
  

 			SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

 			SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");

-			Map<String,String> res=client.getLectureData(id);

+			Map<String,String> res=client.getLectureData(id,SessionData.session.getAuthToken());

 			labelName.setText(res.get("name"));

 			labelAktiv.setText(res.get("isActive"));

 			labeldesc.setText(res.get("desc"));