summaryrefslogtreecommitdiffstats
path: root/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/permissions
diff options
context:
space:
mode:
authorSimon Rettberg2015-09-01 16:26:09 +0200
committerSimon Rettberg2015-09-01 16:26:09 +0200
commit802a564dae4e41d149d307bfd1265d30e02ce792 (patch)
tree83334c36451ac0e47c8402ba1ae6df89bbb4d843 /dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/permissions
parent[client] ImageDetailsWindow: only show popup menu item if image-version is ac... (diff)
downloadtutor-module-802a564dae4e41d149d307bfd1265d30e02ce792.tar.gz
tutor-module-802a564dae4e41d149d307bfd1265d30e02ce792.tar.xz
tutor-module-802a564dae4e41d149d307bfd1265d30e02ce792.zip
[server] Store block hashes in DB
Diffstat (limited to 'dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/permissions')
-rw-r--r--dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/permissions/User.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/permissions/User.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/permissions/User.java
index 0fc8a365..191a5f92 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/permissions/User.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/permissions/User.java
@@ -183,11 +183,14 @@ public class User {
"No permission to delete this image");
}
- public static void canDownloadImageVersionOrFail(UserInfo user, String imageVersionId)
+ public static void canDownloadImageVersionOrFail(UserInfo user, String imageBaseId, String imageVersionId)
throws TAuthorizationException, TNotFoundException, TInvocationException {
ImageDetailsRead image;
try {
- image = DbImage.getImageDetails(user, DbImage.getBaseIdForVersionId(imageVersionId));
+ if (imageBaseId == null) {
+ imageBaseId = DbImage.getBaseIdForVersionId(imageVersionId);
+ }
+ image = DbImage.getImageDetails(user, imageBaseId);
} catch (SQLException e) {
throw new TInvocationException();
}