summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Bauer2015-07-22 17:55:37 +0200
committerJonathan Bauer2015-07-22 17:55:37 +0200
commit8eb50778f67d43ba3fd4ded9d09863431ac84e21 (patch)
treeeae8bc40e4488b07d7dbc9f379f232268000fc05
parent[client] focus the "neu" button after each image list refresh (diff)
parent[server] Fix prepared statement parameter name (diff)
downloadtutor-module-8eb50778f67d43ba3fd4ded9d09863431ac84e21.tar.gz
tutor-module-8eb50778f67d43ba3fd4ded9d09863431ac84e21.tar.xz
tutor-module-8eb50778f67d43ba3fd4ded9d09863431ac84e21.zip
Merge branch 'v1.1' of git.openslx.org:openslx-ng/tutor-module into v1.1
-rw-r--r--dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImagePermissions.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImagePermissions.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImagePermissions.java
index 7f8bf33f..19562d4e 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImagePermissions.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImagePermissions.java
@@ -106,7 +106,7 @@ public class DbImagePermissions {
try (MysqlConnection connection = Database.getConnection()) {
MysqlStatement stmt = connection.prepareStatement("DELETE FROM imagepermission"
+ " WHERE imagebaseid = :baseid");
- stmt.setString("imagebaseid", imageBaseId);
+ stmt.setString("baseid", imageBaseId);
stmt.executeUpdate();
stmt = connection.prepareStatement("INSERT INTO imagepermission"
+ " (imagebaseid, userid, canlink, candownload, canedit, canadmin)"