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, 15 insertions, 30 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
index e9decd1b..9aff1648 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
@@ -165,8 +165,7 @@ public class SearchImage_GUI extends JFrame {
 	/**

 	 * Create the dialog.

 	 */

-	public SearchImage_GUI(Component formerGUI) {

-		

+	public SearchImage_GUI(Component formerGUI) {
 		

 		addWindowListener(new WindowAdapter() {

 			@Override

@@ -302,7 +301,7 @@ public class SearchImage_GUI extends JFrame {
 			e.printStackTrace();

 		}

 		// Setzt den Fenstertitel

-		setTitle("bwLehrpool Suite - Image suchen");

+		setTitle("bwLehrpool Suite - Image suchen - "+person.verantwortlicher.getUserID());

 		// Zentriert das Fenster in die Bildmitte

 		setBounds(0, 0, 918, 722);

 		setLocationRelativeTo(formerGUI);

@@ -503,29 +502,6 @@ public class SearchImage_GUI extends JFrame {
 

 		tabbedPane = new JTabbedPane(JTabbedPane.TOP);

 		

-		//not needed anymore, as the filters are set by the full text search completely

-		/*

-		tabbedPane.addChangeListener(new ChangeListener() {

-			public void stateChanged(ChangeEvent arg0) {

-				if (tabbedPane.getSelectedIndex() == 0 && activeSearch == false) 

-				{

-

-					String username = person.verantwortlicher.getName() + " "

-							+ person.verantwortlicher.getVorname();

-					//rowSorterMyImages.setRowFilter(RowFilter.regexFilter(username, 4));

-				} 

-				else if (tabbedPane.getSelectedIndex() == 1&& activeSearch == false) 

-				{

-					//rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter("true", 8)); //--> caused bug: no initial list in public images

-				}

-				else if (tabbedPane.getSelectedIndex() == 2 && activeSearch == false) 

-				{

-					//rowSorterAll.setRowFilter(null);

-				}

-

-			}

-		});

-		*/

 		tabbedPane.setBounds(10, 158, 557, 339);

 		contentPanel.add(tabbedPane);

 

@@ -739,7 +715,7 @@ public class SearchImage_GUI extends JFrame {
 												tableAllImages

 														.convertRowIndexToModel(tableAllImages

 																.getSelectedRow()),

-												8).equals("true") == true) {

+												8).equals("true") == true || person.verantwortlicher.getRole().equals("Admin")) {

 							String imageid = modelAll

 									.getValueAt(

 											tableAllImages

@@ -785,6 +761,8 @@ public class SearchImage_GUI extends JFrame {
 		});

 		btnDownload.setBounds(449, 508, 118, 23);

 		contentPanel.add(btnDownload);

+		

+

 		{

 			JPanel buttonPane = new JPanel();

 			buttonPane.setBounds(0, 640, 902, 33);

@@ -1006,7 +984,7 @@ public class SearchImage_GUI extends JFrame {
 			}

 		});

 		menuBar.add(mnNewMenu_Info);

-		

+

 		c = this;

 

 	}

@@ -1019,7 +997,7 @@ public class SearchImage_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.getImageListPermissionRead(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());

 			}

@@ -1050,6 +1028,9 @@ public class SearchImage_GUI extends JFrame {
 				i.next();

 

 			}

+			

+			//show number of rows in GUI

+			tabbedPane.setTitleAt(0, tabbedPane.getTitleAt(0)+" ("+model.getRowCount()+") ");

 

 			return model;

 		} catch (TException | ParseException e1) {

@@ -1066,7 +1047,7 @@ public class SearchImage_GUI extends JFrame {
 		List<server.generated.Image> images;

 		try {

 			// Hole eine Liste der Images

-			images = client.getImageList(SessionData.session.getAuthToken());

+			images = client.getImageList(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());

 

 			Iterator<server.generated.Image> i = images.iterator();

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

@@ -1096,6 +1077,8 @@ public class SearchImage_GUI extends JFrame {
 				i.next();

 

 			}

+			//show number of rows in GUI

+			tabbedPane.setTitleAt(2, tabbedPane.getTitleAt(2)+" ("+model.getRowCount()+") ");

 

 			return model;

 		} catch (TException | ParseException e1) {

@@ -1141,6 +1124,8 @@ public class SearchImage_GUI extends JFrame {
 					i.next();

 

 				}

+				//show number of rows in GUI

+				tabbedPane.setTitleAt(1, tabbedPane.getTitleAt(1)+" ("+model.getRowCount()+") ");

 

 				return model;

 			} catch (TException | ParseException e1) {