diff options
| author | Simon Rettberg | 2015-09-03 19:27:50 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2015-09-03 19:27:50 +0200 |
| commit | 2ba5d314618fb7668322fc6a543ad35f9f18fd75 (patch) | |
| tree | 389d26a5b0913b23562ee2473b0b2115c4deb359 /dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java | |
| parent | [client] Show usable images by default, show admin images when selecting "sho... (diff) | |
| download | tutor-module-2ba5d314618fb7668322fc6a543ad35f9f18fd75.tar.gz tutor-module-2ba5d314618fb7668322fc6a543ad35f9f18fd75.tar.xz tutor-module-2ba5d314618fb7668322fc6a543ad35f9f18fd75.zip | |
[server] Allow lecture with no image; start httprpc classes
Diffstat (limited to 'dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java')
| -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 5f4bfaac..e5e7fe4f 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 @@ -168,7 +168,7 @@ public class DbLecture { + " l.isexam, l.hasinternetaccess, l.caneditdefault, l.canadmindefault," + " i.isvalid AS imgvalid, perm.canedit, perm.canadmin" + " FROM lecture l " - + " INNER JOIN imageversion i USING (imageversionid)" + + " LEFT JOIN imageversion i USING (imageversionid)" + " LEFT JOIN lecturepermission perm ON (perm.lectureid = l.lectureid AND perm.userid = :userid)"; public static LectureSummary getLectureSummary(UserInfo user, String lectureId) throws SQLException, @@ -242,7 +242,7 @@ public class DbLecture { + " l.updatetime, l.ownerid, l.updaterid, l.runscript, l.nics, l.netrules, l.isexam," + " l.hasinternetaccess, l.caneditdefault, l.canadmindefault, p.canedit, p.canadmin" + " FROM lecture l " - + " INNER JOIN imageversion i USING (imageversionid)" + + " LEFT JOIN imageversion i USING (imageversionid)" + " LEFT JOIN lecturepermission p ON (l.lectureid = p.lectureid AND p.userid = :userid)" + " WHERE l.lectureid = :lectureid LIMIT 1"); stmt.setString("userid", user.userId); |