[ARVADOS] updated: d85ec3b1d45863839186537c6c832732784d5689

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/views/collections/_choose_rows.html.erb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

       via  d85ec3b1d45863839186537c6c832732784d5689 (commit)
      from  1966eff7c92733225cd9fe1a4121ae0b8f1153d3 (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 d85ec3b1d45863839186537c6c832732784d5689
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
--