[ARVADOS] updated: b7dbb80a0745d5daec4b3a04b6c9e9e19732cb3e
Git user
git at public.curoverse.com
Tue Jun 7 17:00:13 EDT 2016
Summary of changes:
apps/workbench/app/models/proxy_work_unit.rb | 8 --------
apps/workbench/app/models/work_unit.rb | 4 ----
apps/workbench/app/views/work_unit/_show_child.html.erb | 2 +-
3 files changed, 1 insertion(+), 13 deletions(-)
via b7dbb80a0745d5daec4b3a04b6c9e9e19732cb3e (commit)
from 8bbc3c48c7211b8bf497edcb0816a4b9bdd94d4c (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 b7dbb80a0745d5daec4b3a04b6c9e9e19732cb3e
Author: radhika <radhika at curoverse.com>
Date: Tue Jun 7 17:00:41 2016 -0400
8876: remove show_child_summary and replace it with is_running?
diff --git a/apps/workbench/app/models/proxy_work_unit.rb b/apps/workbench/app/models/proxy_work_unit.rb
index 95c88c0..22f9020 100644
--- a/apps/workbench/app/models/proxy_work_unit.rb
+++ b/apps/workbench/app/models/proxy_work_unit.rb
@@ -204,14 +204,6 @@ class ProxyWorkUnit < WorkUnit
end
end
- def show_child_summary
- if state_label == "Running"
- if child_summary
- child_summary_str
- end
- end
- end
-
def is_running?
state_label == 'Running'
end
diff --git a/apps/workbench/app/models/work_unit.rb b/apps/workbench/app/models/work_unit.rb
index f6c1f61..8da6d92 100644
--- a/apps/workbench/app/models/work_unit.rb
+++ b/apps/workbench/app/models/work_unit.rb
@@ -136,10 +136,6 @@ class WorkUnit
# return queued time if the work unit is queued
end
- def show_child_summary
- # child summary for a running work unit
- end
-
def is_running?
# is the work unit in running state?
end
diff --git a/apps/workbench/app/views/work_unit/_show_child.html.erb b/apps/workbench/app/views/work_unit/_show_child.html.erb
index e5aacc7..b55d888 100644
--- a/apps/workbench/app/views/work_unit/_show_child.html.erb
+++ b/apps/workbench/app/views/work_unit/_show_child.html.erb
@@ -35,7 +35,7 @@
<div class="col-md-3">
Queued for <%= render_runtime(queuetime, false) %>.
</div>
- <% elsif current_obj.show_child_summary %>
+ <% elsif current_obj.is_running? %>
<div class="col-md-3">
<span class="task-summary-status">
<%= current_obj.child_summary_str %>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list