projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f573c35
)
3088: Show created at timestamp instead of Age
author
radhika <radhika@curoverse.com>
Tue, 24 Jun 2014 20:13:27 +0000
(16:13 -0400)
committer
radhika <radhika@curoverse.com>
Tue, 24 Jun 2014 20:13:27 +0000
(16:13 -0400)
apps/workbench/app/views/collections/_index_tbody.html.erb
patch
|
blob
|
history
apps/workbench/app/views/collections/_show_recent.html.erb
patch
|
blob
|
history
apps/workbench/app/views/pipeline_instances/_show_recent.html.erb
patch
|
blob
|
history
apps/workbench/app/views/users/_tables.html.erb
patch
|
blob
|
history
diff --git
a/apps/workbench/app/views/collections/_index_tbody.html.erb
b/apps/workbench/app/views/collections/_index_tbody.html.erb
index deba78e47b7f2723b2fa10da36a7674b357a123f..ec5a09e3c6a8a1c676cabb74d0f9fc40e75c2770 100644
(file)
--- a/
apps/workbench/app/views/collections/_index_tbody.html.erb
+++ b/
apps/workbench/app/views/collections/_index_tbody.html.erb
@@
-26,7
+26,7
@@
<% end %>
</td>
<td>
<% end %>
</td>
<td>
- <%=
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 %>
</td>
<td>
<% current_state = @collection_info[c.uuid][:wanted_by_me] ? 'persistent' : 'cache' %>
</td>
<td>
<% current_state = @collection_info[c.uuid][:wanted_by_me] ? 'persistent' : 'cache' %>
diff --git
a/apps/workbench/app/views/collections/_show_recent.html.erb
b/apps/workbench/app/views/collections/_show_recent.html.erb
index 80640ad3991bb20ada08bc5154a4ac2806f5f685..21a815c40cc0b0cb7363263ae43c76fa36dcbed8 100644
(file)
--- a/
apps/workbench/app/views/collections/_show_recent.html.erb
+++ b/
apps/workbench/app/views/collections/_show_recent.html.erb
@@
-33,7
+33,7
@@
<th></th>
<th>uuid</th>
<th>contents</th>
<th></th>
<th>uuid</th>
<th>contents</th>
- <th>
age
</th>
+ <th>
created at
</th>
<th>storage</th>
<th>tags</th>
</tr>
<th>storage</th>
<th>tags</th>
</tr>
diff --git
a/apps/workbench/app/views/pipeline_instances/_show_recent.html.erb
b/apps/workbench/app/views/pipeline_instances/_show_recent.html.erb
index 86eab623f6595508043ee31634580435056caceb..fc67e1791a93954ac447c25fa17f21c234cf1e6a 100644
(file)
--- a/
apps/workbench/app/views/pipeline_instances/_show_recent.html.erb
+++ b/
apps/workbench/app/views/pipeline_instances/_show_recent.html.erb
@@
-31,7
+31,7
@@
</th><th>
Owner
</th><th>
</th><th>
Owner
</th><th>
- Age
+ Created at
</th><th>
</th>
</tr>
</th><th>
</th>
</tr>
@@
-52,7
+52,7
@@
</td><td>
<%= link_to_if_arvados_object ob.owner_uuid, friendly_name: true %>
</td><td>
</td><td>
<%= link_to_if_arvados_object ob.owner_uuid, friendly_name: true %>
</td><td>
- <%=
distance_of_time_in_words(ob.created_at, Time.now)
%>
+ <%=
ob.created_at.to_s
%>
</td><td>
<%= render partial: 'delete_object_button', locals: {object:ob} %>
</td>
</td><td>
<%= render partial: 'delete_object_button', locals: {object:ob} %>
</td>
diff --git
a/apps/workbench/app/views/users/_tables.html.erb
b/apps/workbench/app/views/users/_tables.html.erb
index a8c00e75442e76b0925a088454177bc90ce8a4ad..ebb52019a9f57d3912c7cc4c9b2383eec689d9b6 100644
(file)
--- a/
apps/workbench/app/views/users/_tables.html.erb
+++ b/
apps/workbench/app/views/users/_tables.html.erb
@@
-20,7
+20,7
@@
<th>Script</th>
<th>Output</th>
<th>Log</th>
<th>Script</th>
<th>Output</th>
<th>Log</th>
- <th>
Age
</th>
+ <th>
Created at
</th>
<th>Status</th>
<th>Progress</th>
</tr>
<th>Status</th>
<th>Progress</th>
</tr>
@@
-92,7
+92,7
@@
<td>
<small>
<td>
<small>
- <%=
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 %>
</small>
</td>
</small>
</td>
@@
-130,7
+130,7
@@
<tr>
<th>Instance</th>
<th>Template</th>
<tr>
<th>Instance</th>
<th>Template</th>
- <th>
Age
</th>
+ <th>
Created at
</th>
<th>Status</th>
<th>Progress</th>
</tr>
<th>Status</th>
<th>Progress</th>
</tr>
@@
-151,7
+151,7
@@
<td>
<small>
<td>
<small>
- <%=
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 %>
</small>
</td>
</small>
</td>
@@
-226,7
+226,7
@@
</td>
<td>
<small>
</td>
<td>
<small>
- <%=
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 %>
</small>
</td>
<td>
</small>
</td>
<td>