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

1 files changed, 10 insertions, 4 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
index 98367420..10be7d2b 100644
--- a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
@@ -41,6 +41,7 @@ import thrift.ThriftConnection;
 import util.OpenLinks;
 import models.Image;
 import models.Links;
+import models.SessionData;
 import models.person;
 
 import javax.swing.JComboBox;
@@ -88,7 +89,12 @@ public class EditImageTechnisch_GUI extends JFrame {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
 				// Beendet die Anwendung bei Klick auf das X
-
+				try {
+					client.setSessionInvalid(SessionData.session.getAuthToken());
+				} catch (TException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
 				System.exit(0);
 			}
 
@@ -201,7 +207,7 @@ public class EditImageTechnisch_GUI extends JFrame {
 		
 		List<String> os = null;
 		try {
-			os=client.getAllOS();
+			os=client.getAllOS(SessionData.session.getAuthToken());
 			for(int i=0;i<os.size();i++) {
 				comboBox.addItem(os.get(i).toString());
 			}
@@ -219,7 +225,7 @@ public class EditImageTechnisch_GUI extends JFrame {
 		panel_1.add(comboBox);
 		
 		try {
-			comboBox.setSelectedItem(client.getOsNameForGuestOs(Image.image.getOS()));
+			comboBox.setSelectedItem(client.getOsNameForGuestOs(Image.image.getOS(),SessionData.session.getAuthToken()));
 		} catch (TException e1) 
 		{
 			// TODO Auto-generated catch block
@@ -382,7 +388,7 @@ public class EditImageTechnisch_GUI extends JFrame {
 						
 						try {
 							//check if user may change permissions and choose window
-							if( (client.userIsImageAdmin(person.verantwortlicher.getUserID(),Image.image.getImageId()) == true)  || (person.verantwortlicher.getRole().equals("Admin")) ){
+							if(client.userIsImageAdmin(Image.image.getImageId(),SessionData.session.getAuthToken(), person.verantwortlicher.getUserID()) == true || (person.verantwortlicher.getRole().equals("Admin"))) {
 								//user has permission, go to permission GUI
 								PermissionEditImage_GUI ea=new PermissionEditImage_GUI(c);
 								ea.setVisible(true);