[ARVADOS] updated: d451eabbcbb8d5885fb30c2c341d93204a008596

[Git user]

Summary of changes:
 apps/workbench/app/models/proxy_work_unit.rb | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

       via  d451eabbcbb8d5885fb30c2c341d93204a008596 (commit)
      from  180074677191e4f30f90e8b8390245ab356b1c3f (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 d451eabbcbb8d5885fb30c2c341d93204a008596
Author: Lucas Di Pentima <lucas at curoverse.com>
Date:   Wed May 24 13:51:47 2017 -0300

    11501: Simplified helper method call. Changed wording of run time description.

diff --git a/apps/workbench/app/models/proxy_work_unit.rb b/apps/workbench/app/models/proxy_work_unit.rb
index 0bfc753..8d1c1e3 100644
--- a/apps/workbench/app/models/proxy_work_unit.rb
+++ b/apps/workbench/app/models/proxy_work_unit.rb
@@ -233,7 +233,7 @@ class ProxyWorkUnit < WorkUnit
   end
 
   def runningtime
-    ApplicationController.helpers.determine_wallclock_runtime(if children.any? then runtime_contributors else [self] end)
+    ApplicationController.helpers.determine_wallclock_runtime runtime_contributors
   end
 
   def show_runtime
@@ -278,13 +278,7 @@ class ProxyWorkUnit < WorkUnit
 
     resp << "<p>"
     if state_label
-      resp << "It "
-      if state_label == 'Running'
-        resp << "has run"
-      else
-        resp << "ran"
-      end
-      resp << " for "
+      resp << "It has runtime of "
 
       cpu_time = cputime
 

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


hooks/post-receive
--