Merge branch 'master' into 12513-make-dashboard-fast-again

[arvados.git] / apps / workbench / app / assets / javascripts / work_unit_log.js

diff --git a/apps/workbench/app/assets/javascripts/work_unit_log.js b/apps/workbench/app/assets/javascripts/work_unit_log.js
index 07ca74c8504269c78a4ac6091ebd1884053eed23..543690b200504fd6578b25e1f3fc530bdfb2d774 100644 (file)
--- a/apps/workbench/app/assets/javascripts/work_unit_log.js
+++ b/apps/workbench/app/assets/javascripts/work_unit_log.js
@@ -1,3 +1,7 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
 $(document).on('arv-log-event', '.arv-log-event-handler-append-logs', function(event, eventData){
     var wasatbottom, txt;
     if (this != event.target) {
@@ -10,8 +14,12 @@ $(document).on('arv-log-event', '.arv-log-event-handler-append-logs', function(e
     }
 
     txt = '';
-    if ('text' in eventData.properties) {
+    if ('text' in eventData.properties &&
+       eventData.properties.text.length > 0) {
         txt += eventData.properties.text;
+        if (txt.slice(txt.length-1) != "\n") {
+            txt += "\n";
+        }
     }
     if (eventData.event_type == 'update' &&
         eventData.object_uuid.indexOf("-dz642-") == 5 &&