X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/87dc5129e903cb7452e06c936d8e5e581c4d2481..7497b21c937bb6e8451f16047945b7cfc9081a53:/apps/workbench/app/views/users/_tables.html.erb
diff --git a/apps/workbench/app/views/users/_tables.html.erb b/apps/workbench/app/views/users/_tables.html.erb
index 09a83f2121..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,22 +20,34 @@
Script |
Output |
Log |
-
Age |
+
Created at |
Status |
-
Progress |
- <%
- job_outputs = []
- job_logs = []
+ <%# Preload collections, logs, and pipeline instance objects %>
+ <%
+ collection_uuids = []
+ log_uuids = []
@my_jobs[0..6].each do |j|
- job_outputs << j.output
- job_logs << j.log
+ collection_uuids << j.output
+ log_uuids << j.log
end
- preload_collections_for_objects job_outputs
- preload_log_collections_for_objects job_logs
+ @my_collections[0..6].each do |c|
+ collection_uuids << c.uuid
+ end
+
+ preload_collections_for_objects collection_uuids
+ preload_log_collections_for_objects log_uuids
+
+ pi_uuids = []
+ @my_pipelines[0..6].each do |p|
+ pi_uuids << p.uuid
+ end
+ resource_class = resource_class_for_uuid(pi_uuids.first, friendly_name: true)
+ preload_objects_for_dataclass resource_class, pi_uuids
%>
+
<% @my_jobs[0..6].each do |j| %>
@@ -46,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? %>
@@ -79,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} %>
@@ -100,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)
@@ -117,21 +126,11 @@
Instance |
Template |
- Age |
+ Created at |
Status |
Progress |
- <%
- pi_uuids = []
- @my_pipelines[0..6].each do |p|
- pi_uuids << p.uuid
- end
-
- resource_class = resource_class_for_uuid(pi_uuids.first, friendly_name: true)
- preload_objects_for_dataclass resource_class, pi_uuids
- %>
-
<% @my_pipelines[0..6].each do |p| %>
@@ -148,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 %>
|
@@ -169,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,
@@ -223,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 %>
|
| | |