diff options
| author | Nino Breuer | 2014-11-03 09:17:29 +0100 |
|---|---|---|
| committer | Nino Breuer | 2014-11-03 09:17:29 +0100 |
| commit | 4a078e9847b348441fdd7a36b558e107a7280ff0 (patch) | |
| tree | 8ad894376343bd00b46bceb113ace5ce1e02737c /dozentenmodulserver/src/main/java/server/ServerHandler.java | |
| parent | v (diff) | |
| parent | • fixed bug which caused search guis to be closed when pressing enter in se... (diff) | |
| download | tutor-module-4a078e9847b348441fdd7a36b558e107a7280ff0.tar.gz tutor-module-4a078e9847b348441fdd7a36b558e107a7280ff0.tar.xz tutor-module-4a078e9847b348441fdd7a36b558e107a7280ff0.zip | |
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Conflicts:
dozentenmodulserver/src/main/java/sql/SQL.java
• Note: manual merge
Diffstat (limited to 'dozentenmodulserver/src/main/java/server/ServerHandler.java')
| -rw-r--r-- | dozentenmodulserver/src/main/java/server/ServerHandler.java | 8 |
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 { |