Aus dem Reiter alle könen nun auch Vorlagen heruntergeladen werden.

3 files changed, 38 insertions, 6 deletions

diff --git a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java
index 3f9d357a..9ebeb791 100644
--- a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java
+++ b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java
@@ -531,7 +531,14 @@ public class SearchEditImage_GUI extends JFrame {
 					}
 				}else if(tabbedPane.getSelectedIndex()==1)
 				{
-					if (tablePublicVorlagen.getSelectedRow() != -1 && modelPublicVorlagen.getValueAt(tablePublicVorlagen.convertRowIndexToModel(tablePublicVorlagen.getSelectedRow()), 4).equals(username)==true) {
+					if (tablePublicVorlagen.getSelectedRow() != -1) {
+						if (modelPublicVorlagen.getValueAt(
+								tablePublicVorlagen
+										.convertRowIndexToModel(tablePublicVorlagen
+												.getSelectedRow()), 4).equals(
+								username) == true ||modelPublicVorlagen.getValueAt(tablePublicVorlagen.convertRowIndexToModel(tablePublicVorlagen
+												.getSelectedRow()), 8).equals(
+								"true") == true  ) {
 						String imageid = modelPublicVorlagen
 								.getValueAt(
 										tablePublicVorlagen
@@ -552,9 +559,23 @@ public class SearchEditImage_GUI extends JFrame {
 						FTPEditDownloader_GUI ea = new FTPEditDownloader_GUI();
 						ea.setVisible(true);
 						dispose();
-				}}else if(tabbedPane.getSelectedIndex()==2)
+						}else {
+							JOptionPane
+							.showMessageDialog(
+									null,
+									"Sie haben keine Berechtigung fremde Images herunterzuladen.",
+									"Message",
+									JOptionPane.INFORMATION_MESSAGE);
+				}}}else if(tabbedPane.getSelectedIndex()==2)
 				{
-					if (tableAllImages.getSelectedRow() != -1 && modelAll.getValueAt(tableAllImages.convertRowIndexToModel(tableAllImages.getSelectedRow()), 4).equals(username)==true) {
+					if (tableAllImages.getSelectedRow() != -1 ) {
+						if (modelAll.getValueAt(
+								tableAllImages
+										.convertRowIndexToModel(tableAllImages
+												.getSelectedRow()), 4).equals(
+								username) == true ||modelAll.getValueAt(tableAllImages.convertRowIndexToModel(tableAllImages
+												.getSelectedRow()), 8).equals(
+								"true") == true  ) {
 						String imageid = modelAll
 								.getValueAt(
 										tableAllImages
@@ -575,7 +596,14 @@ public class SearchEditImage_GUI extends JFrame {
 						FTPEditDownloader_GUI ea = new FTPEditDownloader_GUI();
 						ea.setVisible(true);
 						dispose();
-				}} else {
+						}else {
+							JOptionPane
+							.showMessageDialog(
+									null,
+									"Sie haben keine Berechtigung fremde Images herunterzuladen.",
+									"Message",
+									JOptionPane.INFORMATION_MESSAGE);
+				}}} else {
 					JOptionPane.showMessageDialog(null,
 							"Bitte w\u00e4hlen Sie ein Image f\u00fcr den Download aus",
 							"Message", JOptionPane.INFORMATION_MESSAGE);
diff --git a/Dozentenmodul/src/gui/image/SearchImage_GUI.java b/Dozentenmodul/src/gui/image/SearchImage_GUI.java
index a2ccfc41..83d18576 100644
--- a/Dozentenmodul/src/gui/image/SearchImage_GUI.java
+++ b/Dozentenmodul/src/gui/image/SearchImage_GUI.java
@@ -580,7 +580,9 @@ public class SearchImage_GUI extends JFrame {
 								tableAllImages

 										.convertRowIndexToModel(tableAllImages

 												.getSelectedRow()), 4).equals(

-								username) == true) {

+								username) == true ||modelAll.getValueAt(tableAllImages.convertRowIndexToModel(tableAllImages

+												.getSelectedRow()), 8).equals(

+								"true") == true  ) {

 							String imageid = modelAll

 									.getValueAt(

 											tableAllImages

diff --git a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
index 5ca11b98..c0f896c0 100644
--- a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
@@ -550,6 +550,7 @@ public class EditLectureLink_GUI extends JFrame {
 																				.convertRowIndexToModel(tablemyImages
 																						.getSelectedRow()), 7)
 																.toString(),
+										person.verantwortlicher.getUsername(),
 										person.verantwortlicher.getVorname(),
 										person.verantwortlicher.getName(),
 										person.verantwortlicher.getHochschule(),
@@ -613,6 +614,7 @@ public class EditLectureLink_GUI extends JFrame {
 																		tablePublicVorlagen
 																				.convertRowIndexToModel(tablePublicVorlagen
 																						.getSelectedRow()), 7).toString(),
+										person.verantwortlicher.getUsername(),
 										person.verantwortlicher.getVorname(),
 										person.verantwortlicher.getName(),
 										person.verantwortlicher.getHochschule(),
@@ -678,7 +680,7 @@ public class EditLectureLink_GUI extends JFrame {
 														.convertRowIndexToModel(tableAllImages
 																.getSelectedRow()), 7)
 										.toString(),
-										
+										person.verantwortlicher.getUsername(),
 										person.verantwortlicher.getVorname(),
 										person.verantwortlicher.getName(),
 										person.verantwortlicher.getHochschule(),