Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module

Conflicts:
	dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
g

1 files changed, 19 insertions, 5 deletions

diff --git a/dozentenmodulserver/src/main/java/server/ServerHandler.java b/dozentenmodulserver/src/main/java/server/ServerHandler.java
index a66083c5..af2734df 100644
--- a/dozentenmodulserver/src/main/java/server/ServerHandler.java
+++ b/dozentenmodulserver/src/main/java/server/ServerHandler.java
@@ -198,23 +198,32 @@ public class ServerHandler implements Server.Iface {
 	}
 
 	@Override
-	public List<Image> getImageList() throws TException {
-		return sql.getImageList();
-
+	public List<Image> getImageListPermissionWrite(String userID) throws TException {
+		return sql.getImageListPermissionWrite(userID);
+	}
+	
+	@Override
+	public List<Image> getImageListPermissionRead(String userID) throws TException {
+		return sql.getImageListPermissionWrite(userID);
+	}
+	
+	
+	@Override
+	public List<Image> getImageListPermissionLink(String userID) throws TException {
+		return sql.getImageListPermissionWrite(userID);
 	}
 
 	@Override
 	public List<String> getAllOS() throws TException {
 		return sql.getAllOS();
-
 	}
 
 	@Override
 	public Map<String, String> getPersonData(String Vorname, String Nachname)
 			throws TException {
 		return sql.getPersonData(Vorname, Nachname);
-
 	}
+	
 
 	@Override
 	public boolean writeLecturedata(String name, String shortdesc, String desc,
@@ -566,5 +575,10 @@ public class ServerHandler implements Server.Iface {
 		log.info(new Date() + " - written additional image rights for "+userID);
 		return success;
 	}
+
+	@Override
+	public List<Person> getPermissionForUserAndImage(String userID, String imageID) throws TException {
+		return sql.getPermissionForUserAndImage(userID, imageID);
+	}
 	
 }// end class