X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/47042547e7873d63f764e85ace085a8da314afd3..42c20b25e1325124b88e3b9b285544dc41122b56:/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 5cce19a0cc..50f7ffe95d 100644
--- a/apps/workbench/app/views/collections/_choose_rows.html.erb
+++ b/apps/workbench/app/views/collections/_choose_rows.html.erb
@@ -1,15 +1,28 @@
-<% @name_links.each do |name_link| %>
- <% puts "looking up #{name_link.head_uuid}" %>
- <% if (object = get_object(name_link.head_uuid)) %>
- <% puts "got #{object}" %>
-
+
+<% @objects.each do |object| %>
+
-
- <%= name_link.name %>
- <% Link.filter([['link_class','=','tag'],['head_uuid','=',object.uuid]]).collect(&:name).each do |tagname| %>
- <%= tagname %>
- <% end %>
+
+ <% if object.respond_to? :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 %>
+ <% links_for_object(object).each do |tag| %>
+ <% if tag.link_class == 'tag' %>
+ <%= tag.name %>
+ <% end %>
+ <% end %>
- <% end %>
<% end %>