Merge pull request #3115 from ControlSystemStudio/CSSTUDIO-2555

CSSTUDIO-2555 Bugfix: edit the source of log entries (if available), not the description of log entries.
ControlSystemStudio · Aug 20, 2024 · 80c7a3b · 80c7a3b
2 parents c1c0dee + 71476c3
commit 80c7a3b
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/...ook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/write/LogEntryUpdateController.java b/...ook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/write/LogEntryUpdateController.java
@@ -273,7 +273,15 @@ public void initialize() {
         titleProperty.set(logEntry.getTitle());
 
         textArea.textProperty().bindBidirectional(descriptionProperty);
-        descriptionProperty.set(logEntry.getDescription() != null ? logEntry.getDescription() : "");
+        if (logEntry.getSource() != null) {
+            descriptionProperty.set(logEntry.getSource());
+        }
+        else if (logEntry.getDescription() != null) {
+            descriptionProperty.set(logEntry.getDescription());
+        }
+        else {
+            descriptionProperty.set("");
+        }
         descriptionProperty.addListener((observable, oldValue, newValue) -> isDirty = true);
 
         Image tagIcon = ImageCache.getImage(LogEntryUpdateController.class, "/icons/add_tag.png");