summaryrefslogtreecommitdiffstats
path: root/dozentenmodulserver
diff options
context:
space:
mode:
authorJonathan Bauer2014-10-10 15:35:08 +0200
committerJonathan Bauer2014-10-10 15:35:08 +0200
commitbf9cd259a63f056477220199d0998b3d64f968ec (patch)
treed4865e06a83e209169dbf120ce064da334618306 /dozentenmodulserver
parent[client] only show vmdk's on EditUploader's file chooser (diff)
parentRemoved wrong field values (lecture name was set to image name) (diff)
downloadtutor-module-bf9cd259a63f056477220199d0998b3d64f968ec.tar.gz
tutor-module-bf9cd259a63f056477220199d0998b3d64f968ec.tar.xz
tutor-module-bf9cd259a63f056477220199d0998b3d64f968ec.zip
Merge branch 'master' of git.openslx.org:openslx-ng/tutor-module
Diffstat (limited to 'dozentenmodulserver')
-rw-r--r--dozentenmodulserver/src/main/java/sql/SQL.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/dozentenmodulserver/src/main/java/sql/SQL.java b/dozentenmodulserver/src/main/java/sql/SQL.java
index cb9464eb..93634bfe 100644
--- a/dozentenmodulserver/src/main/java/sql/SQL.java
+++ b/dozentenmodulserver/src/main/java/sql/SQL.java
@@ -942,7 +942,7 @@ public class SQL {
return ret;
}
- public int setImageRights(String pk_person, String pk_image,int role ,int read, int write, int admin,int linkallowed) {
+ public int setImageRights(String pk_person, String pk_image,int role ,int read, int write,int linkallowed, int admin) {