diff options
| author | Simon Rettberg | 2015-08-04 15:14:24 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2015-08-04 15:14:24 +0200 |
| commit | 4c9dd228cb183ad823d094fef68ab633ebc8cb74 (patch) | |
| tree | 6015f868854291158d8a6dd0cc5b57d1d00eac18 /dozentenmodulserver | |
| parent | [*] Simplify DB scheme by removing version.isenabled and image.currentversionid (diff) | |
| download | tutor-module-4c9dd228cb183ad823d094fef68ab633ebc8cb74.tar.gz tutor-module-4c9dd228cb183ad823d094fef68ab633ebc8cb74.tar.xz tutor-module-4c9dd228cb183ad823d094fef68ab633ebc8cb74.zip | |
[server] Forgot one occurence of version.isenabled in an SQL query
Diffstat (limited to 'dozentenmodulserver')
| -rw-r--r-- | dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java | 4 |
1 files changed, 2 insertions, 2 deletions
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 a40fbbb3..e2c3f5e3 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 @@ -149,7 +149,7 @@ public class DbLecture { + " l.lectureid, l.displayname AS lecturename, l.imageversionid, i.imagebaseid," + " l.isenabled, l.starttime, l.endtime, l.lastused, l.usecount, l.ownerid, l.updaterid," + " l.isexam, l.hasinternetaccess, l.caneditdefault, l.canadmindefault," - + " i.isenabled AS imgenabled, i.isvalid AS imgvalid, p.canedit, p.canadmin" + + " i.isvalid AS imgvalid, p.canedit, p.canadmin" + " FROM lecture l " + " INNER JOIN imageversion i USING (imageversionid)" + " LEFT JOIN lecturepermission p ON (p.lectureid = l.lectureid AND p.userid = :userid)" @@ -178,7 +178,7 @@ public class DbLecture { lecture.setHasInternetAccess(rs.getBoolean("hasinternetaccess")); lecture.setDefaultPermissions(DbLecturePermissions.fromResultSetDefault(rs)); lecture.setUserPermissions(DbLecturePermissions.fromResultSetUser(rs)); - lecture.setIsImageVersionUsable(rs.getBoolean("imgenabled") && rs.getBoolean("imgvalid")); + lecture.setIsImageVersionUsable(rs.getBoolean("imgvalid")); list.add(lecture); } return list; |