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

Conflicts:
	dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
	dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
	dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java

möp. großes geschrei, fehler bitte an mich.
	dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
	dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
	dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
	dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
	dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
	dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
	dozentenmodulserver/src/main/java/server/ServerHandler.java
	dozentenmodulserver/src/main/java/server/generated/Server.java
	dozentenmodulserver/thrift/server.thrift

1 files changed, 29 insertions, 2 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
index 418ce276..10be7d2b 100644
--- a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
@@ -50,6 +50,12 @@ import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
 
 import javax.swing.JCheckBox;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeEvent;
+import java.awt.event.ItemListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.FocusAdapter;
+import java.awt.event.FocusEvent;
 
 @SuppressWarnings("serial")
 public class EditImageTechnisch_GUI extends JFrame {
@@ -105,7 +111,7 @@ public class EditImageTechnisch_GUI extends JFrame {
 			e.printStackTrace();
 		}
 		// Setzt den Titel des Fensters
-		setTitle("bwLehrpool Suite - Image bearbeiten");
+		setTitle("bwLehrpool Suite - Image bearbeiten - "+person.verantwortlicher.getUserID());
 		// Zentriert das Fenster
 		setBounds(0, 0, 603, 722);
 		setLocationRelativeTo(formerGUI);
@@ -152,11 +158,20 @@ public class EditImageTechnisch_GUI extends JFrame {
 		panel_1.add(lblNewLabel_2);
 		
 		chckbxIsLicensed = new JCheckBox("");
+		chckbxIsLicensed.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				//if windows is selected, always set isLicensed()=true
+				if(comboBox.getSelectedItem().toString().startsWith("Windows")){
+					chckbxIsLicensed.setSelected(true);
+				}
+			}
+		});
 		chckbxIsLicensed.setBounds(266, 57, 97, 23);
 		panel_1.add(chckbxIsLicensed);
 		
 		chckbxIsInternetBlocked = new JCheckBox("");
 		chckbxIsInternetBlocked.setBounds(266, 85, 97, 23);
+		chckbxIsInternetBlocked.setEnabled(false);
 		panel_1.add(chckbxIsInternetBlocked);
 
 		JLabel lblInternetIstInnerhalb = new JLabel(
@@ -178,6 +193,18 @@ public class EditImageTechnisch_GUI extends JFrame {
 		panel_1.add(lblBetriebssystem);
 		
 		comboBox = new JComboBox<String>();
+		comboBox.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				
+				//if windows is selected, always set isLicensed()=true
+				if(comboBox.getSelectedItem().toString().startsWith("Windows")){
+					chckbxIsLicensed.setSelected(true);
+				}
+			}
+		});
+
+		
+		
 		List<String> os = null;
 		try {
 			os=client.getAllOS(SessionData.session.getAuthToken());
@@ -361,7 +388,7 @@ public class EditImageTechnisch_GUI extends JFrame {
 						
 						try {
 							//check if user may change permissions and choose window
-							if(client.userIsImageAdmin(Image.image.getImageId(),SessionData.session.getAuthToken(), person.verantwortlicher.getUserID()) == true){
+							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);