diff options
| author | Stephan Schwaer | 2015-10-29 16:57:25 +0100 |
|---|---|---|
| committer | Stephan Schwaer | 2015-10-29 16:57:25 +0100 |
| commit | 761433b91e9524d16d17eb4280f6f61bd1abb26f (patch) | |
| tree | 455275ea3b277897dfe7bd3c512141a99d44d75c | |
| parent | [client] Layout fixes in ImageDetails and removed obsolete Space in user feed... (diff) | |
| parent | [server] unlinkLecture: Actually execute query; deleteImgVersion: only unlink... (diff) | |
| download | tutor-module-761433b91e9524d16d17eb4280f6f61bd1abb26f.tar.gz tutor-module-761433b91e9524d16d17eb4280f6f61bd1abb26f.tar.xz tutor-module-761433b91e9524d16d17eb4280f6f61bd1abb26f.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/DbImage.java | 4 | ||||
| -rw-r--r-- | dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java index ace8df01..55fa02b2 100644 --- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java +++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java @@ -640,9 +640,9 @@ public class DbImage { public static void deleteVersionPermanently(LocalImageVersion image) throws SQLException { try (MysqlConnection connection = Database.getConnection()) { - DbLecture.deletePermanently(connection, image); // Unlink any linked lectures DbLecture.unlinkFromImageVersion(connection, image.imageVersionId); + //DbLecture.deletePermanently(connection, image); // Unlink latest version field from image base MysqlStatement unlinkStmt = connection.prepareStatement("UPDATE imagebase SET latestversionid = NULL" + " WHERE latestversionid = :imageversionid"); @@ -654,7 +654,7 @@ public class DbImage { stmt.executeUpdate(); connection.commit(); } catch (SQLException e) { - LOGGER.error("Query failed in DbImage.deleteVersionPermanently()", e); + LOGGER.error("Query failed in DbImage.deleteVersionPermanently(2)", e); throw e; } } diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java index 1436aa36..0ed62770 100644 --- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java +++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java @@ -532,6 +532,7 @@ public class DbLecture { MysqlStatement stmt = connection.prepareStatement("UPDATE lecture SET imageversionid = NULL" + " WHERE imageversionid = :imageversionid"); stmt.setString("imageversionid", imageVersionId); + stmt.executeUpdate(); } } |