X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/1e8f93a86465bce9bf6b32245ef99932c3cbfe08..9197c69b5780a5b5ce9c40bd67e530aefdf0c7a9:/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 c52057cf02..bcbf3d7c6d 100644
--- a/apps/workbench/app/views/users/_tables.html.erb
+++ b/apps/workbench/app/views/users/_tables.html.erb
@@ -5,7 +5,7 @@
<% if not current_user.andand.is_active or @my_jobs.empty? %>
(None)
<% else %>
-
Script | Output | Log | -Status | Age | +Status | <% @my_jobs[0..6].each do |j| %> @@ -37,7 +37,7 @@ <% Collection.limit(1).where(uuid: j.output).each do |c| c.files.each do |file| %> - <%= "#{file[0]}/#{file[1]}" %> + <%= file[0] == '.' ? file[1] : "#{file[0]}/#{file[1]}" %> <% end %> <% end %> @@ -48,7 +48,7 @@- <% if j.success %> + <% if j.log %> Log <% end %> @@ -56,8 +56,8 @@ | - <%= raw(distance_of_time_in_words(j[:created_at], Time.now).sub('about -','~').sub(' ',' ')) if j[:created_at] %> ago + <%= raw(distance_of_time_in_words(j.created_at, Time.now).sub('about +','~').sub(' ',' ')) if j.created_at %> | @@ -89,7 +89,7 @@ <% if not current_user.andand.is_active or @my_pipelines.empty? %>
---|
- <%= raw(distance_of_time_in_words(p[:created_at], Time.now).sub('about -','~').sub(' ',' ')) if p[:created_at] %> ago + <%= raw(distance_of_time_in_words(p.created_at, Time.now).sub('about +','~').sub(' ',' ')) if p.created_at %> | @@ -140,17 +140,29 @@
Contents | +Tags | Age | + <% if @my_tag_links[c.uuid] %> + + <%= @my_tag_links[c.uuid].collect(&:name).join(", ") %> + + <% end %> + | - <%= raw(distance_of_time_in_words(c[:created_at], Time.now).sub('about -','~').sub(' ',' ')) if c[:created_at] %> ago + <%= raw(distance_of_time_in_words(c.created_at, Time.now).sub('about +','~').sub(' ',' ')) if c.created_at %> |
---|