X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7a54fd6a073e03f98f68d0b6c816a9f394f625dd..08c06bc813d96634b362e8c5736341fb2d874f59:/apps/workbench/app/views/search/_choose_rows.html.erb

diff --git a/apps/workbench/app/views/search/_choose_rows.html.erb b/apps/workbench/app/views/search/_choose_rows.html.erb
index 81d1f68e1d..61f9300356 100644
--- a/apps/workbench/app/views/search/_choose_rows.html.erb
+++ b/apps/workbench/app/views/search/_choose_rows.html.erb
@@ -12,10 +12,14 @@
   <div class="row filterable selectable" data-section-name="<%= object.class.to_s %>" data-object-uuid="<%= object.uuid %>" data-preview-href="<%= chooser_preview_url_for object %>">
     <div class="col-sm-12" style="overflow-x:hidden; white-space: nowrap">
       <i class="fa fa-fw <%= icon_class %>"></i>
-      <% if object.respond_to?(:name) and object.name and object.name.length > 0 %>
+      <% if (name_link = @objects.links_for(object, 'name').first) %>
+        <%= name_link.name %>
+        <span style="display:none"><%= object.uuid %></span>
+      <% elsif object.respond_to?(:name) and object.name and object.name.length > 0 %>
         <%= object.name %>
+        <span style="display:none"><%= object.uuid %></span>
       <% else %>
-        unnamed - <span class="arvados-uuid"><%= object.uuid %></span>
+        <span class="arvados-uuid"><%= object.uuid %></span>
       <% end %>
     </div>
   </div>