X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/3692a4ac4d8f76d2e704af5e504652650b4a00cc..b6f54ccb32e05348e9a5c76c7ed3211203cd4e55:/apps/workbench/app/views/users/_tables.html.erb?ds=sidebyside
diff --git a/apps/workbench/app/views/users/_tables.html.erb b/apps/workbench/app/views/users/_tables.html.erb
index a8c00e7544..b0f57530de 100644
--- a/apps/workbench/app/views/users/_tables.html.erb
+++ b/apps/workbench/app/views/users/_tables.html.erb
@@ -1,7 +1,7 @@
<% if current_user.andand.is_active %>
Recent jobs
- <%= link_to '(refresh)', {format: :js}, {class: 'refresh', remote: true, method: 'get'} %>
+ <%= link_to '(refresh)', {format: :js}, {class: 'refresh', remote: true} %>
<%= link_to raw("Show all jobs →"), jobs_path, class: 'pull-right' %>
<% if not current_user.andand.is_active or @my_jobs.empty? %>
(None)
@@ -20,9 +20,8 @@
Script |
Output |
Log |
-
Age |
+
Created at |
Status |
-
Progress |
<%# Preload collections, logs, and pipeline instance objects %>
@@ -59,7 +58,7 @@
- <% if j.success and j.output %>
+ <% if j.state == "Complete" and j.output %>
<% collections = collections_for_object(j.output) %>
<% if collections && !collections.empty? %>
@@ -92,13 +91,10 @@
- <%= raw(distance_of_time_in_words(j.created_at, Time.now).sub('about ','~').sub(' ',' ')) if j.created_at %>
+ <%= j.created_at.to_s if j.created_at %>
|
-
- <%= render partial: 'job_status_label', locals: {:j => j} %>
- |
<%= render partial: 'job_progress', locals: {:j => j} %>
@@ -113,7 +109,7 @@
Recent pipeline instances
- <%= link_to '(refresh)', {format: :js}, {class: 'refresh', remote: true, method: 'get'} %>
+ <%= link_to '(refresh)', {format: :js}, {class: 'refresh', remote: true} %>
<%= link_to raw("Show all pipeline instances →"), pipeline_instances_path, class: 'pull-right' %>
<% if not current_user.andand.is_active or @my_pipelines.empty? %>
(None)
@@ -130,7 +126,7 @@
Instance |
Template |
- Age |
+ Created at |
Status |
Progress |
@@ -151,7 +147,7 @@
- <%= raw(distance_of_time_in_words(p.created_at, Time.now).sub('about ','~').sub(' ',' ')) if p.created_at %>
+ <%= (p.created_at.to_s) if p.created_at %>
|
@@ -172,7 +168,7 @@
Recent collections
- <%= link_to '(refresh)', {format: :js}, {class: 'refresh', remote: true, method: 'get'} %>
+ <%= link_to '(refresh)', {format: :js}, {class: 'refresh', remote: true} %>
<%= link_to raw("Show all collections →"), collections_path, class: 'pull-right' %>
<%= form_tag collections_path,
@@ -226,7 +222,7 @@
|
- <%= raw(distance_of_time_in_words(c.created_at, Time.now).sub('about ','~').sub(' ',' ')) if c.created_at %>
+ <%= c.created_at.to_s if c.created_at %>
|
| |