[ARVADOS] updated: 68c3fbc94ecfa4115af4d6ccb95171b46432eb72

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/views/collections/_choose_rows.html.erb | 9 ++++++++-
 services/api/db/structure.sql                              | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

       via  68c3fbc94ecfa4115af4d6ccb95171b46432eb72 (commit)
       via  0bbd1138943bb0c7395798eb234f5b2460c43d22 (commit)
      from  4dd469c1bd4c1f4a2edac6c2d63bc571e874aa3f (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 68c3fbc94ecfa4115af4d6ccb95171b46432eb72
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Fri Aug 22 13:59:06 2014 -0400

    Change 'expire_time' column to 'expires_at' for consistency with other date
    columns.

diff --git a/services/api/db/structure.sql b/services/api/db/structure.sql
index de29332..af4bf6a 100644
--- a/services/api/db/structure.sql
+++ b/services/api/db/structure.sql
@@ -169,7 +169,7 @@ CREATE TABLE collections (
     name character varying(255),
     description character varying(255),
     properties text,
-    expire_time date
+    expires_at date
 );
 
 

commit 0bbd1138943bb0c7395798eb234f5b2460c43d22
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Fri Aug 22 13:56:59 2014 -0400

    Display first file in collection if name field is nil or empty. refs #3504

diff --git a/apps/workbench/app/views/collections/_choose_rows.html.erb b/apps/workbench/app/views/collections/_choose_rows.html.erb
index 27b66e4..da0f975 100644
--- a/apps/workbench/app/views/collections/_choose_rows.html.erb
+++ b/apps/workbench/app/views/collections/_choose_rows.html.erb
@@ -4,7 +4,14 @@
          style="margin-left: 1em; border-bottom-style: solid; border-bottom-width: 1px; border-bottom-color: #DDDDDD">
       <i class="fa fa-fw fa-archive"></i>
       <% if object.respond_to? :name %>
-        <%= object.name %>
+        <% if not (object.name.nil? or object.name.empty?) %>
+          <%= object.name %>
+        <% elsif object.is_a? Collection and object.files.length > 0 %>
+          <%= object.files[0][1] %>
+          <%= "+ #{object.files.length-1} more" if object.files.length > 1 %>
+        <% else %>
+          <%= object.uuid %>
+        <% end %>
       <% else %>
         <%= object.uuid %>
       <% end %>

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


hooks/post-receive
--