summaryrefslogtreecommitdiffstats
path: root/dozentenmodulserver
diff options
context:
space:
mode:
authorNino Breuer2015-01-29 17:20:26 +0100
committerNino Breuer2015-01-29 17:20:26 +0100
commit79804f255e550a710d4340a0991abf43ec9574f0 (patch)
tree94e7a64fdf9220f72accd313cc3d9ccc3cda8098 /dozentenmodulserver
parentMerge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module (diff)
downloadtutor-module-79804f255e550a710d4340a0991abf43ec9574f0.tar.gz
tutor-module-79804f255e550a710d4340a0991abf43ec9574f0.tar.xz
tutor-module-79804f255e550a710d4340a0991abf43ec9574f0.zip
• fixed bug where in edit image, link was set to admin and admin to link
Diffstat (limited to 'dozentenmodulserver')
-rw-r--r--dozentenmodulserver/src/main/java/server/ServerHandler.java2
-rw-r--r--dozentenmodulserver/src/main/java/sql/SQL.java4
2 files changed, 4 insertions, 2 deletions
diff --git a/dozentenmodulserver/src/main/java/server/ServerHandler.java b/dozentenmodulserver/src/main/java/server/ServerHandler.java
index ebba88e1..284f959c 100644
--- a/dozentenmodulserver/src/main/java/server/ServerHandler.java
+++ b/dozentenmodulserver/src/main/java/server/ServerHandler.java
@@ -591,6 +591,8 @@ public class ServerHandler implements Server.Iface {
File tmpFile = new File(Configuration.config.getAbsolute_path()
+ stringFile);
+
+ log.info("Absolute Path used for deletion: "+tmpFile);
try {
// File wird von Server gelöscht
diff --git a/dozentenmodulserver/src/main/java/sql/SQL.java b/dozentenmodulserver/src/main/java/sql/SQL.java
index 5a5071a9..98d8ebd5 100644
--- a/dozentenmodulserver/src/main/java/sql/SQL.java
+++ b/dozentenmodulserver/src/main/java/sql/SQL.java
@@ -2004,8 +2004,8 @@ public class SQL {
String sql = "INSERT INTO pm_VLData_image (" + "GUID, "
+ "GUID_imageID, " + "roleID, " + "userID, "
- + "image_read, " + "image_write, " + "Image_admin, "
- + "link_allowed)" + "VALUES" + "(?,?,?,?,?,?,?,?)";
+ + "image_read, " + "image_write, " + ", link_allowed"
+ + "Image_admin)" + "VALUES" + "(?,?,?,?,?,?,?,?)";
PreparedStatement prest = con.prepareStatement(sql);