[ARVADOS] updated: f9e3477a6a6b39ea32a0299d95971b03ebc3d50c

Git user git at public.curoverse.com
Wed Sep 7 14:03:26 EDT 2016


Summary of changes:
 .../app/assets/javascripts/pipeline_instances.js   | 20 ------
 .../app/assets/javascripts/work_unit_log.js        | 68 +++++++++++++++++++
 apps/workbench/app/models/container_work_unit.rb   |  2 +-
 .../test/helpers/fake_websocket_helper.rb          | 18 +++++
 apps/workbench/test/integration/work_units_test.rb | 77 ++++++++++++++++++++++
 apps/workbench/test/integration_helper.rb          |  5 ++
 apps/workbench/test/support/fake_websocket.js      | 15 +++++
 apps/workbench/test/test_helper.rb                 |  2 +-
 8 files changed, 185 insertions(+), 22 deletions(-)
 create mode 100644 apps/workbench/app/assets/javascripts/work_unit_log.js
 create mode 100644 apps/workbench/test/helpers/fake_websocket_helper.rb
 create mode 100644 apps/workbench/test/support/fake_websocket.js

       via  f9e3477a6a6b39ea32a0299d95971b03ebc3d50c (commit)
       via  2d721e0fe63f0cf127f44a45c75201c696a8cd9e (commit)
       via  b046d1f162990361418a8e926aead5b307402a42 (commit)
       via  bf6dfd5785f6767d2700dadfebb8591a8595d5f3 (commit)
      from  5aaaed7d7b1287c0133dd66c9492d6df62790288 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit f9e3477a6a6b39ea32a0299d95971b03ebc3d50c
Merge: 5aaaed7 2d721e0
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Sep 7 12:05:29 2016 -0400

    Merge branch '9679-dispatch-event-logs'
    
    refs #9679


commit 2d721e0fe63f0cf127f44a45c75201c696a8cd9e
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Sep 7 11:57:17 2016 -0400

    9679: Add trailing newline to log text if necessary.

diff --git a/apps/workbench/app/assets/javascripts/work_unit_log.js b/apps/workbench/app/assets/javascripts/work_unit_log.js
index 07ca74c..d81637e 100644
--- a/apps/workbench/app/assets/javascripts/work_unit_log.js
+++ b/apps/workbench/app/assets/javascripts/work_unit_log.js
@@ -10,8 +10,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 &&

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list