projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '3149-filter-any' refs #3149
[arvados.git]
/
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 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>