diff options
| author | Stephan Schwär | 2020-11-17 00:19:26 +0100 |
|---|---|---|
| committer | Stephan Schwär | 2020-11-17 00:19:26 +0100 |
| commit | 1abd53bfef7a461408a2b4ced0e1956294f909f5 (patch) | |
| tree | 23bfb637bc55f0c978a42ac3232a89e79cd04afa /dozentenmodulserver/src | |
| parent | Merge remote-tracking branch 'origin/buxfix/searchCaseSensitive' into feature... (diff) | |
| parent | [client] Access directly to variable description (diff) | |
| download | tutor-module-1abd53bfef7a461408a2b4ced0e1956294f909f5.tar.gz tutor-module-1abd53bfef7a461408a2b4ced0e1956294f909f5.tar.xz tutor-module-1abd53bfef7a461408a2b4ced0e1956294f909f5.zip | |
Merge branch 'feature/search-in-description' into feature-merge
Diffstat (limited to 'dozentenmodulserver/src')
| -rw-r--r-- | dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java | 8 | ||||
| -rw-r--r-- | dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java | 3 |
2 files changed, 6 insertions, 5 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 99e90099..36c3a466 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 @@ -57,7 +57,7 @@ public class DbImage { // TODO: Implement tag search functionality try (MysqlConnection connection = Database.getConnection()) { MysqlStatement stmt = connection.prepareStatement("SELECT" - + " i.imagebaseid, i.latestversionid, i.displayname," + + " i.imagebaseid, i.latestversionid, i.displayname, i.description," + " i.osid, i.virtid, i.createtime, i.updatetime, i.ownerid," + " i.sharemode, i.istemplate, i.canlinkdefault, i.candownloaddefault," + " i.caneditdefault, i.canadmindefault," @@ -209,8 +209,8 @@ public class DbImage { private static ImageSummaryRead resultSetToSummary(UserInfo user, ResultSet rs) throws SQLException { ImagePermissions defaultPermissions = DbImagePermissions.fromResultSetDefault(rs); ImageSummaryRead entry = new ImageSummaryRead(rs.getString("imagebaseid"), - rs.getString("latestversionid"), rs.getString("displayname"), rs.getInt("osid"), - rs.getString("virtid"), rs.getLong("createtime"), rs.getLong("updatetime"), + rs.getString("latestversionid"), rs.getString("displayname"), rs.getString("description"), + rs.getInt("osid"), rs.getString("virtid"), rs.getLong("createtime"), rs.getLong("updatetime"), rs.getLong("uploadtime"), rs.getLong("expiretime"), rs.getString("ownerid"), rs.getString("uploaderid"), toShareMode(rs.getString("sharemode")), rs.getLong("filesize"), rs.getByte("isrestricted") != 0, rs.getByte("isvalid") != 0, rs.getByte("isprocessed") != 0, @@ -248,7 +248,7 @@ public class DbImage { protected static ImageSummaryRead getImageSummary(MysqlConnection connection, UserInfo user, String imageBaseId) throws SQLException, TNotFoundException { MysqlStatement stmt = connection.prepareStatement("SELECT" - + " i.imagebaseid, i.latestversionid, i.displayname," + + " i.imagebaseid, i.latestversionid, i.displayname, i.description," + " i.osid, i.virtid, i.createtime, i.updatetime, i.ownerid," + " i.sharemode, i.istemplate, i.canlinkdefault, i.candownloaddefault," + " i.caneditdefault, i.canadmindefault," 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 e0799c29..4ecb9d99 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 @@ -193,6 +193,7 @@ public class DbLecture { LectureSummary lecture = new LectureSummary(); lecture.setLectureId(rs.getString("lectureid")); lecture.setLectureName(rs.getString("lecturename")); + lecture.setDescription(rs.getString("description")); lecture.setImageVersionId(rs.getString("imageversionid")); lecture.setImageBaseId(rs.getString("imagebaseid")); lecture.setIsEnabled(rs.getBoolean("isenabled")); @@ -215,7 +216,7 @@ public class DbLecture { } private static final String summaryBaseSql = "SELECT" - + " l.lectureid, l.displayname AS lecturename, l.imageversionid, i.imagebaseid," + + " l.lectureid, l.displayname AS lecturename, l.description, l.imageversionid, i.imagebaseid," + " l.isenabled, l.starttime, l.endtime, l.lastused, l.usecount, l.ownerid, l.updaterid," + " l.isexam, l.hasinternetaccess, l.hasusbaccess, l.caneditdefault, l.canadmindefault," + " i.isvalid AS imgvalid, perm.canedit, perm.canadmin" |