diff options
| author | Simon Rettberg | 2016-01-19 15:40:15 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2016-01-19 15:40:15 +0100 |
| commit | ffba802b538b82cc202939cebf26e3925ced9686 (patch) | |
| tree | da5bb21cc205e49ca31dae5a9bec6093364f82b2 /dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java | |
| parent | [client] Fix NPE related to location editor (diff) | |
| download | tutor-module-ffba802b538b82cc202939cebf26e3925ced9686.tar.gz tutor-module-ffba802b538b82cc202939cebf26e3925ced9686.tar.xz tutor-module-ffba802b538b82cc202939cebf26e3925ced9686.zip | |
[server] Fill location info in LectureRead, set maxLocationsPerLecture to 4
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 | 6 |
1 files changed, 3 insertions, 3 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 1f0daf66..ace13b05 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 @@ -283,8 +283,8 @@ public class DbLecture { lecture.setImageBaseId(rs.getString("imagebaseid")); lecture.setAutoUpdate(rs.getBoolean("autoupdate")); lecture.setIsEnabled(rs.getBoolean("isenabled")); - //lecture.setLimitToAllowedUsers(rs.getBoolean("isprivate")); - //lecture.setLimitToLocations(rs.getBoolean("islocationprivate")); TODO + lecture.setLimitToAllowedUsers(rs.getBoolean("isprivate")); + lecture.setLimitToLocations(rs.getBoolean("islocationprivate")); lecture.setStartTime(rs.getLong("starttime")); lecture.setEndTime(rs.getLong("endtime")); lecture.setLastUsed(rs.getLong("lastused")); @@ -312,7 +312,7 @@ public class DbLecture { lecture.setDefaultPermissions(DbLecturePermissions.fromResultSetDefault(rs)); lecture.setUserPermissions(DbLecturePermissions.fromResultSetUser(rs)); User.setCombinedUserPermissions(lecture, user); - // TODO: Query locations + lecture.setLocationIds(DbLocation.getLectureLocations(connection, lectureId)); return lecture; } catch (SQLException e) { LOGGER.error("Query failed in DbLecture.getLectureDetails()", e); |