summaryrefslogtreecommitdiffstats
path: root/dozentenmodulserver/src/main/java/server/ServerHandler.java
diff options
context:
space:
mode:
authorNino Breuer2014-10-31 13:22:00 +0100
committerNino Breuer2014-10-31 13:22:00 +0100
commit9651efdcb9bbd4720071063b074d2e22c503bac8 (patch)
treeb561f67647b3c9453339925d714fc8be4188c2dc /dozentenmodulserver/src/main/java/server/ServerHandler.java
parentimplemented äääääh template filter (diff)
parent-allowed 3 special chars in image name (diff)
downloadtutor-module-9651efdcb9bbd4720071063b074d2e22c503bac8.tar.gz
tutor-module-9651efdcb9bbd4720071063b074d2e22c503bac8.tar.xz
tutor-module-9651efdcb9bbd4720071063b074d2e22c503bac8.zip
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Diffstat (limited to 'dozentenmodulserver/src/main/java/server/ServerHandler.java')
-rw-r--r--dozentenmodulserver/src/main/java/server/ServerHandler.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/dozentenmodulserver/src/main/java/server/ServerHandler.java b/dozentenmodulserver/src/main/java/server/ServerHandler.java
index a6412e24..054ab706 100644
--- a/dozentenmodulserver/src/main/java/server/ServerHandler.java
+++ b/dozentenmodulserver/src/main/java/server/ServerHandler.java
@@ -213,7 +213,7 @@ public class ServerHandler implements Server.Iface {
@Override
public List<Image> getImageListPermissionLink(String userID)
throws TException {
- return sql.getImageListPermissionRead(userID);
+ return sql.getImageListPermissionLink(userID);
}
@Override
@@ -222,6 +222,12 @@ public class ServerHandler implements Server.Iface {
return sql.getImageListPermissionAdmin(userID);
}
+ @Override
+ public List<Image> getImageListAllTemplates()
+ throws TException {
+ return sql.getImageListAllTemplates();
+ }
+
@Override
public List<String> getAllOS() throws TException {