X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6403b8728d3120d6cb22583b3963d2a030e88aa3..e6c2f09b14d03db040f2b81c451a7630bb78f1b1:/apps/workbench/app/views/collections/_choose_rows.html.erb

diff --git a/apps/workbench/app/views/collections/_choose_rows.html.erb b/apps/workbench/app/views/collections/_choose_rows.html.erb
index 27b66e4482..17274ddb94 100644
--- a/apps/workbench/app/views/collections/_choose_rows.html.erb
+++ b/apps/workbench/app/views/collections/_choose_rows.html.erb
@@ -1,10 +1,17 @@
-<% @collections.each do |object| %>
-    <div class="row filterable selectable" data-object-uuid="<%= object.uuid %>"
-         data-preview-href="<%= chooser_preview_url_for object %>"
+<% @objects.each do |object| %>
+    <div class="row filterable selectable <%= 'use-preview-selection' if params['use_preview_selection']%>" data-object-uuid="<%= object.uuid %>"
+         data-preview-href="<%= chooser_preview_url_for object, params['use_preview_selection'] %>"
          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 %>
@@ -15,19 +22,3 @@
       <% end %>
     </div>
 <% end %>
-
-<% @name_links.each do |name_link| %>
-  <% if (object = get_object(name_link.head_uuid)) %>
-    <div class="row filterable selectable" data-object-uuid="<%= name_link.uuid %>"
-         data-preview-href="<%= chooser_preview_url_for object %>"
-         style="margin-left: 1em; border-bottom-style: solid; border-bottom-width: 1px; border-bottom-color: #DDDDDD">
-      <i class="fa fa-fw fa-archive"></i>
-      <%= name_link.name %>
-      <% links_for_object(object).each do |tag| %>
-        <% if tag.link_class == 'tag' %>
-          <span class="label label-info"><%= tag.name %></span>
-        <% end %>
-      <% end %>
-    </div>
-  <% end %>
-<% end %>