1 files changed, 19 insertions, 12 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
index 2b21bd04..f9701a0c 100644
--- a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
@@ -38,10 +38,10 @@ import javax.swing.border.TitledBorder;
 
 import server.generated.Server.Client;
 import thrift.ThriftConnection;
-import util.GuiOrganizer;
 import util.OpenLinks;
 import models.Image;
 import models.Links;
+import models.person;
 
 import javax.swing.JComboBox;
 
@@ -348,20 +348,27 @@ public class EditImageTechnisch_GUI extends JFrame {
 						Image.image.setInternet(chckbxIsInternetBlocked.isSelected());
 						Image.image.setLicensed(chckbxIsLicensed.isSelected());
 						Image.image.setOS(comboBox.getSelectedItem().toString());
+
 						
-						//System.out.println("OS bei Klick auf Weiter: "+Image.image.getOS());
+						LOGGER.info("user is '"+person.verantwortlicher.getUserID()+"' and imageID is '"+Image.image.getImageId()+"'.");
 						
-						//LOGGER.info("OS: " + Image.image.getOS() +
-						//			", Vorlage: " + Image.image.isVorlage() +
-						//			", Lizenzpflichtig: " + Image.image.isLicensed() +
-						//			", Internetsperre: " + Image.image.isInternet() +
-						//			", CPU: " + Image.image.getCpu() +
-						//			",  RAM: " + Image.image.getRam());
 						
-						// oeffnet das naechste Fenster
-						PermissionEditImage_GUI ea=new PermissionEditImage_GUI(c);
-						ea.setVisible(true);
-						dispose();
+						try {
+							//check if user may change permissions and choose window
+							if(client.userIsImageAdmin(person.verantwortlicher.getUserID(),Image.image.getImageId()) == true){
+								//user has permission, go to permission GUI
+								PermissionEditImage_GUI ea=new PermissionEditImage_GUI(c);
+								ea.setVisible(true);
+								dispose();
+							} else {
+								// user does not have permission, go straight to upload GUI
+								FTPEditUploader_GUI ea = new FTPEditUploader_GUI(c);
+								ea.setVisible(true);
+								dispose();
+							}
+						} catch (TException e1) {
+							e1.printStackTrace();
+						}
 
 					}
 				});