X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/161478d5be79e83f3e200b46f0d8d003caa2ffe0..0edc5b2af65e41a247f373ffd206d8283b6cbc55:/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 c271f2b5e8..ebb52019a9 100644
--- a/apps/workbench/app/views/users/_tables.html.erb
+++ b/apps/workbench/app/views/users/_tables.html.erb
@@ -20,22 +20,35 @@
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 job_outputs
- preload_log_collections 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| %>
@@ -48,7 +61,9 @@
<% if j.success and j.output %>
- <% get_collection(j.output).each do |c| %>
+ <% collections = collections_for_object(j.output) %>
+ <% if collections && !collections.empty? %>
+ <% c = collections.first %>
<% c.files.each do |file| %>
<%= file[0] == '.' ? file[1] : "#{file[0]}/#{file[1]}" %>
<% end %>
@@ -61,7 +76,9 @@
<% if j.log %>
- <% get_log_collection(j.log).each do |c| %>
+ <% log_collections = log_collections_for_object(j.log) %>
+ <% if log_collections && !log_collections.empty? %>
+ <% c = log_collections.first %>
<% c.files.each do |file| %>
Log
<% end %>
@@ -75,7 +92,7 @@
- <%= 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 %>
|
@@ -113,7 +130,7 @@
Instance |
Template |
- Age |
+ Created at |
Status |
Progress |
@@ -134,7 +151,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 %>
|
@@ -209,7 +226,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 %>
|
| |