[ARVADOS] updated: 1d5d09e8d1568fdae039571306bd5e56a8273ac7

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/helpers/pipeline_instances_helper.rb       | 11 ++++++-----
 .../app/views/pipeline_instances/_running_component.html.erb  |  2 +-
 .../pipeline_instances/_show_components_running.html.erb      |  4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

       via  1d5d09e8d1568fdae039571306bd5e56a8273ac7 (commit)
      from  eec77d22e408fe3983cba666c6f5185ecf2d15ec (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 1d5d09e8d1568fdae039571306bd5e56a8273ac7
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue Sep 23 14:35:54 2014 -0400

    Bugfix extra space in display in render_runtime and queued time for pipeline.
    refs #3187

diff --git a/apps/workbench/app/helpers/pipeline_instances_helper.rb b/apps/workbench/app/helpers/pipeline_instances_helper.rb
index f0c4eb7..599da42 100644
--- a/apps/workbench/app/helpers/pipeline_instances_helper.rb
+++ b/apps/workbench/app/helpers/pipeline_instances_helper.rb
@@ -246,19 +246,20 @@ module PipelineInstancesHelper
     end    
 
     if use_words
-      s = ""
+      s = []
       if days > 0 then
-        s += "#{days} day#{'s' if days != 1}"
+        s << "#{days} day#{'s' if days != 1}"
       end
       if hours > 0 then
-        s += " #{hours} hour#{'s' if hours != 1}"
+        s << "#{hours} hour#{'s' if hours != 1}"
       end
       if minutes > 0 then
-        s += " #{minutes} minute#{'s' if minutes != 1}"
+        s << "#{minutes} minute#{'s' if minutes != 1}"
       end
       if seconds > 0 and not round_to_min 
-        s += " #{seconds} second#{'s' if seconds != 1}"
+        s << "#{seconds} second#{'s' if seconds != 1}"
       end
+      s = s * " "
     else
       s = ""
       if days > 0
diff --git a/apps/workbench/app/views/pipeline_instances/_running_component.html.erb b/apps/workbench/app/views/pipeline_instances/_running_component.html.erb
index 5eed855..8f89916 100644
--- a/apps/workbench/app/views/pipeline_instances/_running_component.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_running_component.html.erb
@@ -1,4 +1,4 @@
-  <% current_job = pj[:job] if pj[:job] != {} %>
+  <% current_job = pj[:job] if pj[:job] != {} and pj[:job][:uuid] %>
   <div class="panel panel-default">
     <div class="panel-heading">
       <div class="container-fluid">
diff --git a/apps/workbench/app/views/pipeline_instances/_show_components_running.html.erb b/apps/workbench/app/views/pipeline_instances/_show_components_running.html.erb
index c3c6d0a..8af8c88 100644
--- a/apps/workbench/app/views/pipeline_instances/_show_components_running.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_show_components_running.html.erb
@@ -58,8 +58,8 @@
          0
        end
        }.reduce(:+) || 0 %>
-    <%= render_runtime(runningtime, true, false) %><% if walltime - runningtime > 0 %>
-      (<%= render_runtime(walltime - runningtime, true) %> queued)<% end %><% if cputime == 0 %>.<% else %>
+    <%= render_runtime(runningtime, true, false) %><% if (walltime - runningtime) > 0 %>
+      (<%= render_runtime(walltime - runningtime, true, false) %> queued)<% end %><% if cputime == 0 %>.<% else %>
       and used
     <%= render_runtime(cputime, true) %>
     of CPU time (<%= (cputime/runningtime).round(1) %>⨯ scaling).

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


hooks/post-receive
--