From 9739aa18fda6f6ebdcac0f939a5ab5b5ad32cc00 Mon Sep 17 00:00:00 2001
From: Michael Wilson
Date: Wed, 29 Oct 2014 11:21:35 +0100
Subject: -Löschen der Berechtigungen bei gelöschtem Image/Versanstaltung
 implementiert -Recht "LinkAllowed" wird jetzt korrekt gesetzt

---
 .../src/main/java/server/ServerHandler.java           | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'dozentenmodulserver/src/main/java/server')

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) {
-- 
cgit v1.2.3-55-g7522