Merge branch 'master' into 12033-multisite-search

[arvados.git] / apps / workbench / app / views / collections / _index_tbody.html.erb

diff --git a/apps/workbench/app/views/collections/_index_tbody.html.erb b/apps/workbench/app/views/collections/_index_tbody.html.erb
index b2b5b2372736aa5948674a44dc3a304e8a39393a..845c92e80220afef55af808717ef46f5d4e8493f 100644 (file)
--- a/apps/workbench/app/views/collections/_index_tbody.html.erb
+++ b/apps/workbench/app/views/collections/_index_tbody.html.erb
@@ -1,15 +1,26 @@
-<% @collections.each do |c| %>
+<%# Copyright (C) The Arvados Authors. All rights reserved.
+
+SPDX-License-Identifier: AGPL-3.0 %>
+
+<% @objects.each do |c| %>
 
 <tr class="collection" data-object-uuid="<%= c.uuid %>">
   <td>
-    <% friendly_name = c.friendly_link_name  %>
-    <% @collection_info[c.uuid][:tag_links].each do |tag_link| %>
-      <% friendly_name += raw(" <span class='label label-info'>#{tag_link.name}</span>") %>
-    <% end %>
-    <%= render :partial => "selection_checkbox", :locals => {:object => c, :friendly_name => friendly_name} %>
+    <%=
+       friendly_name = c.friendly_link_name
+       @collection_info[c.uuid][:tag_links].each do |tag_link|
+         friendly_name += raw(" <span class='label label-info'>#{tag_link.name}</span>")
+       end
+       render partial: "selection_checkbox", locals: {
+         object: c,
+         friendly_name: friendly_name
+       }
+    %>
+
+    <%= render :partial => "show_object_button", :locals => {object: c, size: 'xs'} %>
   </td>
   <td>
-    <%= link_to_if_arvados_object c.uuid, {:no_tags => true } %>
+    <%= c.uuid %>
   </td>
   <td>
     <% i = 0 %>
@@ -24,18 +35,7 @@
     <% end %>
   </td>
   <td>
-    <%= raw(distance_of_time_in_words(c.created_at, Time.now).sub('about ','~').sub(' ','&nbsp;')) if c.created_at %>
-  </td>
-  <td>
-    <% current_state = @collection_info[c.uuid][:wanted_by_me] ? 'persistent' : 'cache' %>
-    <div class="btn-group btn-group-xs toggle-persist fill" data-toggle="buttons" data-remote-href="<%= set_persistent_collection_path(id: c.uuid) %>" data-persistent-state="<%= current_state %>">
-      <label class="btn btn-info <%= 'active' if current_state=='persistent' %>">
-        <input type="radio" name="wants" value="persistent">Persistent
-      </label>
-      <label class="btn btn-info <%= 'active' if current_state=='cache' %>">
-        <input type="radio" name="wants" value="cache">Cache
-      </label>
-    </div>
+    <%= c.created_at.to_s if c.created_at %>
   </td>
   <td class="add-tag-button">
     <a class="btn btn-xs btn-info add-tag-button pull-right" data-remote-href="<%= url_for(controller: 'links', action: 'create') %>" data-remote-method="post"><i class="glyphicon glyphicon-plus"></i>&nbsp;Add</a>
@@ -43,7 +43,7 @@
     <% if @collection_info[c.uuid] %>
       <% @collection_info[c.uuid][:tag_links].each do |tag_link| %>
         <span class="label label-info removable-tag" data-tag-link-uuid="<%= tag_link.uuid %>"><%= tag_link.name %>
-          <% if tag_link.owner_uuid == current_user.uuid %>
+          <% if tag_link.owner_uuid == current_user.andand.uuid %>
           &nbsp;<a title="Delete tag"><i class="glyphicon glyphicon-trash"></i></a>
           <% end %>
         </span>&nbsp;