diff options
| author | Mürsel Türk | 2020-11-13 12:40:04 +0100 |
|---|---|---|
| committer | Mürsel Türk | 2020-11-13 12:40:04 +0100 |
| commit | 119b7e4709986f701d1b6f1c87ad67f556a2ac08 (patch) | |
| tree | df662fda077a2567e4140c31b9eca9f62fc4928c | |
| parent | [client] Check if description field is set (diff) | |
| download | tutor-module-119b7e4709986f701d1b6f1c87ad67f556a2ac08.tar.gz tutor-module-119b7e4709986f701d1b6f1c87ad67f556a2ac08.tar.xz tutor-module-119b7e4709986f701d1b6f1c87ad67f556a2ac08.zip | |
[client] Access directly to variable description
Issue: #3691
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ImageListViewer.java | 7 | ||||
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureListWindow.java | 9 |
2 files changed, 9 insertions, 7 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ImageListViewer.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ImageListViewer.java index b1f31220..82e72b16 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ImageListViewer.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ImageListViewer.java @@ -77,11 +77,12 @@ public class ImageListViewer extends QLabel { if (searchFieldPattern.matcher(image.imageName).find()) return true; if (chkSearchInDescription.isSelected()) { - ImageSummaryRead._Fields descriptionField = image.fieldForId(23); - if (descriptionField != null && image.isSet(descriptionField)) { - String description = image.getFieldValue(descriptionField).toString(); + String description = image.description; + if (description != null) { if (searchFieldPattern.matcher(description).find()) return true; + } else { + LOGGER.debug("Description is null: cannot be searched in description"); } } UserInfo user = UserCache.find(image.ownerId); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureListWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureListWindow.java index f61ac6a3..cd5c5b35 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureListWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureListWindow.java @@ -120,11 +120,12 @@ public class LectureListWindow extends LectureListWindowLayout { if (searchFieldPattern.matcher(lecture.lectureName).find()) return true; if (chkSearchInDescription.isSelected()) { - LectureSummary._Fields descriptionField = lecture.fieldForId(18); - if (descriptionField != null && lecture.isSet(descriptionField)) { - String description = lecture.getFieldValue(descriptionField).toString(); - if (description != null && searchFieldPattern.matcher(description).find()) + String description = lecture.description; + if (description != null) { + if (searchFieldPattern.matcher(description).find()) return true; + } else { + LOGGER.debug("Description is null: cannot be searched in description"); } } UserInfo user = UserCache.find(lecture.ownerId); |