projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 4036-combine-collections-in-project-issue
[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 75745376c0bb5c560dda892a016fd4c917594a66..3d5c1c7a5899213fafb6bec3ab2909b18ac77e5f 100644
(file)
--- a/
apps/workbench/app/views/collections/_index_tbody.html.erb
+++ b/
apps/workbench/app/views/collections/_index_tbody.html.erb
@@
-7,9
+7,11
@@
<% 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 += 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>
</td>
<td>
- <%=
link_to_if_arvados_object c.uuid, {:no_tags => true }
%>
+ <%=
c.uuid
%>
</td>
<td>
<% i = 0 %>
</td>
<td>
<% i = 0 %>
@@
-23,18
+25,8
@@
⋮
<% end %>
</td>
⋮
<% end %>
</td>
- <td><%= link_to_if_arvados_object c.owner_uuid, friendly_name: true %></td>
- <td>
- <%= raw(distance_of_time_in_words(c.created_at, Time.now).sub('about ','~').sub(' ',' ')) if c.created_at %>
- </td>
<td>
<td>
- <% if @collection_info[c.uuid][:wanted_by_me] %>
- <span class="label label-info">2×</span>
- <% elsif @collection_info[c.uuid][:wanted] %>
- <span class="label">2×</span>
- <% else %>
- <span class="label">cache</span>
- <% end %>
+ <%= 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> Add</a>
</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> Add</a>