Merge branch 'master' into 9998-unsigned_manifest

[arvados.git] / apps / workbench / app / views / projects / _show_contents_rows.html.erb

diff --git a/apps/workbench/app/views/projects/_show_contents_rows.html.erb b/apps/workbench/app/views/projects/_show_contents_rows.html.erb
index e1996a7f406f2700dbfb291b07cd1d7962d6164e..5f0f60b0b26a18d2f6a5285144efdb8c96e080a4 100644 (file)
--- a/apps/workbench/app/views/projects/_show_contents_rows.html.erb
+++ b/apps/workbench/app/views/projects/_show_contents_rows.html.erb
@@ -7,7 +7,7 @@
       >
     <td>
       <div style="width:1em; display:inline-block;">
-        <%= render partial: 'selection_checkbox', locals: {object: name_object, friendly_name: ((name_object.name rescue '') || '')} %>
+        <%= render partial: 'selection_checkbox', locals: {object: object, friendly_name: ((name_object.name rescue '') || '')} %>
       </div>
     </td>
 
@@ -26,7 +26,9 @@
     </td>
 
     <td>
-      <%= render_editable_attribute (name_link || object), 'name', nil, {tiptitle: 'rename'} %>
+      <% if object.respond_to?(:name) %>
+        <%= render_editable_attribute (name_link || object), 'name', nil, {}, {tiptitle: 'rename'} %>
+      <% end %>
     </td>
 
     <td class="arv-description-in-table">