[ARVADOS] updated: 185aee8518374b4a5998b5458248f68d14d5608c

git at public.curoverse.com git at public.curoverse.com
Tue Jun 24 16:14:04 EDT 2014


Summary of changes:
 apps/workbench/app/views/collections/_index_tbody.html.erb     |  2 +-
 apps/workbench/app/views/collections/_show_recent.html.erb     |  2 +-
 .../app/views/pipeline_instances/_show_recent.html.erb         |  4 ++--
 apps/workbench/app/views/users/_tables.html.erb                | 10 +++++-----
 4 files changed, 9 insertions(+), 9 deletions(-)

       via  185aee8518374b4a5998b5458248f68d14d5608c (commit)
      from  f573c35a8f829ac4624f4ef9fbe0d0178a734fa3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 185aee8518374b4a5998b5458248f68d14d5608c
Author: radhika <radhika at curoverse.com>
Date:   Tue Jun 24 16:13:27 2014 -0400

    3088: Show created at timestamp instead of Age

diff --git a/apps/workbench/app/views/collections/_index_tbody.html.erb b/apps/workbench/app/views/collections/_index_tbody.html.erb
index deba78e..ec5a09e 100644
--- 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>
-    <%= 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' %>
diff --git a/apps/workbench/app/views/collections/_show_recent.html.erb b/apps/workbench/app/views/collections/_show_recent.html.erb
index 80640ad..21a815c 100644
--- 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>age</th>
+      <th>created at</th>
       <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 86eab62..fc67e17 100644
--- 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>
-	Age
+	Created at
       </th><th>
       </th>
     </tr>
@@ -52,7 +52,7 @@
       </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>
diff --git a/apps/workbench/app/views/users/_tables.html.erb b/apps/workbench/app/views/users/_tables.html.erb
index a8c00e7..ebb5201 100644
--- 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>Age</th>
+          <th>Created at</th>
           <th>Status</th>
           <th>Progress</th>
         </tr>
@@ -92,7 +92,7 @@
 
 <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>
 
@@ -130,7 +130,7 @@
       <tr>
         <th>Instance</th>
         <th>Template</th>
-        <th>Age</th>
+        <th>Created at</th>
         <th>Status</th>
         <th>Progress</th>
       </tr>
@@ -151,7 +151,7 @@
 
           <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>
 
@@ -226,7 +226,7 @@
           </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>

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list