Merge branch 'master' into 3038-default-port-numbers

[arvados.git] / apps / workbench / app / views / projects / _show_dashboard.html.erb

diff --git a/apps/workbench/app/views/projects/_show_dashboard.html.erb b/apps/workbench/app/views/projects/_show_dashboard.html.erb
index c8f768b55a1df19d16b4ad684ca6c172056607b1..2841637ded00df136128d4e86d8d4409e380c6e4 100644 (file)
--- a/apps/workbench/app/views/projects/_show_dashboard.html.erb
+++ b/apps/workbench/app/views/projects/_show_dashboard.html.erb
@@ -38,7 +38,7 @@
                           <% running << k %>
                         <% elsif Job::state(v[:job]) == "Failed" or Job::state(v[:job]) == "Cancelled" %>
                           <% failed << k %>
-                        <% elsif Job::state(v[:job]) == "Completed" %>
+                        <% elsif Job::state(v[:job]) == "Complete" %>
                           <% completed << k %>
                         <% elsif Job::state(v[:job]) == "Queued" %>
                           <% queued << k %>
@@ -142,7 +142,7 @@
     </div>
 
     <div class="col-md-6">
-      <% nodes = Node.all.select { |n| (Time.now - n[:last_ping_at]) < 3600 } %>
+      <% nodes = Node.all %>
       <div class="panel panel-default" style="min-height: 10em">
         <div class="panel-heading"><span class="panel-title">Compute status</span></div>
         <div class="panel-body">