-Löschen der Berechtigungen bei gelöschtem Image/Versanstaltung implementiert

-Recht "LinkAllowed" wird jetzt korrekt gesetzt

3 files changed, 40 insertions, 11 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
index b222b7ed..8db64f4f 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
@@ -697,6 +697,16 @@ public class FTPCreateUploader_GUI extends JFrame implements
 						RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageLinkAllowed(),
 						RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageAdmin()
 						);
+				/*
+				LOGGER.info(
+						"Name: "+Image.image.getImagename()
+						+"\tUserID: "+RightsManagement.rightsManagement.getPermittedUserList().get(i).getUserID()
+						+"\tisImageRead: "+RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageRead()
+						+"\tisImageWrite: "+RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageWrite()
+						+"\tisImageLInkAllowed: "+RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageLinkAllowed()
+						+"\tisImageAdmin: "+RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageAdmin()
+						);
+						*/
 			
 			}//end for
 			
diff --git a/dozentenmodulserver/src/main/java/server/ServerHandler.java b/dozentenmodulserver/src/main/java/server/ServerHandler.java
index d4b763cb..1aeb8820 100644
--- a/dozentenmodulserver/src/main/java/server/ServerHandler.java
+++ b/dozentenmodulserver/src/main/java/server/ServerHandler.java
@@ -429,8 +429,13 @@ public class ServerHandler implements Server.Iface {
 
 	@Override
 	public boolean deleteImageData(String id, String version) throws TException {
-
-		return sql.deleteImage(id, version);
+		boolean success=false;
+		
+		if(sql.deleteImage(id, version)==true){
+			success=true;
+			log.info("Image '"+id+"' and permissions successfully deleted.");
+		}
+		return success;
 	}
 
 	@Override
@@ -441,6 +446,7 @@ public class ServerHandler implements Server.Iface {
 	}
 
 	public boolean deleteLecture(String id, String hs, String user) {
+		boolean success = false;
 		Map<String, String> map = new HashMap<String, String>();
 		map = sql.getDeleteXMLData(id);
 		try {
@@ -456,8 +462,12 @@ public class ServerHandler implements Server.Iface {
 			log.info(new Date() + " - Failed to execute deleteLecture");
 			e.printStackTrace();
 		}
-		return sql.deleteLecture(id);
-
+		
+		if(sql.deleteLecture(id) == true){
+			success = true;
+			log.info("Lecture '"+id+"' and permissions successfully deleted.");
+		}
+		return success;
 	}
 
 	@Override
@@ -604,6 +614,7 @@ public class ServerHandler implements Server.Iface {
 		// return null;
 	}
 
+	//set permissions for users which are !=userID
 	public boolean writeAdditionalImageRights(String imageName, String userID,
 			boolean isRead, boolean isWrite, boolean isLinkAllowed,
 			boolean isAdmin) {
diff --git a/dozentenmodulserver/src/main/java/sql/SQL.java b/dozentenmodulserver/src/main/java/sql/SQL.java
index 3990bf4e..80b97623 100644
--- a/dozentenmodulserver/src/main/java/sql/SQL.java
+++ b/dozentenmodulserver/src/main/java/sql/SQL.java
@@ -839,16 +839,20 @@ public class SQL {
 			Connection con = getConnection();

 			Statement stm = con.createStatement();

 

-			stm.executeUpdate("DELETE FROM bwLehrpool.m_VLData_imageInfo where GUID_imageID = '"

-					+ id + "' " + "AND imageVersion = '" + version + "';");

+			//delete the image record

+			stm.executeUpdate("DELETE FROM bwLehrpool.m_VLData_imageInfo WHERE GUID_imageID = '"+ id + "' " + "AND imageVersion = '" + version + "';");

 

+			//delete all permission records for this image

+			stm.executeUpdate("DELETE FROM bwLehrpool.pm_VLData_image WHERE GUID_imageID = '"+id+"';");

+			

+			

 			con.commit();

 			con.close();

 			return true;

 

 		} catch (SQLException e) {

 			// TODO Auto-generated catch block

-			log.info(new Date() + " - Failed to deleteImage.");

+			log.info(new Date() + " - Failed to deleteImage and permissions.");

 			e.printStackTrace();

 		}

 

@@ -928,15 +932,19 @@ public class SQL {
 		try {

 			Connection con = getConnection();

 			Statement stm = con.createStatement();

-			stm.executeUpdate("DELETE FROM bwLehrpool.m_VLData_lecture WHERE lectureID = '"

-					+ id + "';");

+			

+			//delete the lecture record

+			stm.executeUpdate("DELETE FROM bwLehrpool.m_VLData_lecture WHERE lectureID = '"	+ id + "';");

 

+			//delete all permission records for this lecture

+			stm.executeUpdate("DELETE FROM bwLehrpool.pm_VLData_lecture WHERE lectureID = '"	+ id + "';");

+			

 			con.commit();

 			con.close();

 			return true;

 		} catch (SQLException e) {

 			// TODO Auto-generated catch block

-			log.info(new Date() + " - Failed to deleteLecture.");

+			log.info(new Date() + " - Failed to deleteLecture and permissions.");

 			e.printStackTrace();

 		}

 

@@ -1497,7 +1505,7 @@ public class SQL {
 					+ "image_read, " + "image_write, " + "Image_admin, "

 					+ "link_allowed)" + "VALUES(" + "'" + uid + "'," + "'"

 					+ imageID + "'," + "1," + "'" + userID + "'," + isRead

-					+ "," + isWrite + "," + isLinkAllowed + "," + isAdmin + ""

+					+ "," + isWrite + "," + isAdmin + "," + isLinkAllowed + ""

 					+ ");");

 			con.commit();

 			con.close();