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, 10 insertions, 2 deletions

diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
index 2549e60f..ea1c7b88 100644
--- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
@@ -100,6 +100,7 @@ public class CreateLectureLink_GUI extends JFrame {
 	boolean activeSearch = false;
 	Component c = null;
 	private JTextField textFieldName;
+	private JLabel lblTotalResults;
 	private String uuid = null;
 	String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung",
 			"Verantwortlicher", "Letztes Update", "ID", "Version", "Template", "Beschreibung" };
@@ -215,7 +216,7 @@ public class CreateLectureLink_GUI extends JFrame {
 			 
 			e.printStackTrace();
 		}
-		setTitle("bwLehrpool Suite - Veranstaltung erzeugen");
+		setTitle("bwLehrpool Suite - Veranstaltung erzeugen - "+person.verantwortlicher.getUserID());
 		setBounds(0, 0, 918, 722);
 		setLocationRelativeTo(formerGUI);
 
@@ -415,6 +416,10 @@ public class CreateLectureLink_GUI extends JFrame {
 		tablemyImages.setRowSorter(rowSorterMyImages);
 
 		scrollPaneMyImage.setViewportView(tablemyImages);
+		
+		lblTotalResults = new JLabel("Anzahl:");
+		lblTotalResults.setBounds(10, 512, 131, 20);
+		contentPanel.add(lblTotalResults);
 
 		{
 			JPanel buttonPane = new JPanel();
@@ -668,6 +673,7 @@ public class CreateLectureLink_GUI extends JFrame {
 		textAreadesc = new JTextArea();
 		textAreadesc.setLineWrap(true);
 		textAreadesc.setBackground(SystemColor.menu);
+		textAreadesc.setFont(new Font("Tahoma", Font.PLAIN, 11));
 		scrollPane.setViewportView(textAreadesc);
 
 		JMenuBar menuBar = new JMenuBar();
@@ -761,7 +767,7 @@ public class CreateLectureLink_GUI extends JFrame {
 		// Hole eine Liste der Images
 		if(person.verantwortlicher.getRole()=="Admin"){
 			//get complete list
-			images = client.getImageList(person.verantwortlicher.getUserID());
+			images = client.getImageList(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());
 		} else {		
 			images = client.getImageListPermissionLink(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());
 		}
@@ -788,6 +794,8 @@ public class CreateLectureLink_GUI extends JFrame {
 			i.next();
 
 		}
+		//show number if rows in GUI
+		lblTotalResults.setText(lblTotalResults.getText()+" "+model.getRowCount());
 		
 		return model;