Merge pull request ControlSystemStudio#3205 from ControlSystemStudio/…

…fix_olog_update Edit olog entry called wrong endpoint
JonasDevelops · Dec 6, 2024 · cd82745 · cd82745
2 parents 1409ed5 + 18856f4
commit cd82745
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/...ook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/write/LogEntryEditorController.java b/...ook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/write/LogEntryEditorController.java
@@ -599,16 +599,25 @@ public void submit() {
             if (editMode.equals(EditMode.NEW_LOG_ENTRY)) {
                 ologLog.setAttachments(attachmentsEditorController.getAttachments());
             }
+            else{
+                ologLog.setId(logEntry.getId());
+            }
             ologLog.setProperties(logPropertiesEditorController.getProperties());
 
             LogClient logClient =
                     logFactory.getLogClient(new SimpleAuthenticationToken(usernameProperty.get(), passwordProperty.get()));
             try {
-                if (replyTo == null) {
-                    logEntryResult = Optional.of(logClient.set(ologLog));
-                } else {
-                    logEntryResult = Optional.of(logClient.reply(ologLog, replyTo));
+                if(editMode.equals(EditMode.NEW_LOG_ENTRY)){
+                    if (replyTo == null) {
+                        logEntryResult = Optional.of(logClient.set(ologLog));
+                    } else {
+                        logEntryResult = Optional.of(logClient.reply(ologLog, replyTo));
+                    }
+                }
+                else{
+                    logEntryResult = Optional.of(logClient.update(ologLog));
                 }
+
                 // Not dirty anymore...
                 isDirty = false;