[ARVADOS] updated: 189495ad597e9b5b167bd47a1ef2b25393e39692
Git user
git at public.curoverse.com
Tue Mar 28 14:10:18 EDT 2017
Summary of changes:
.../workbench/app/views/collections/_show_files.html.erb | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
via 189495ad597e9b5b167bd47a1ef2b25393e39692 (commit)
from f14965fac774465c0179f5e318c9df3df9b6a05d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 189495ad597e9b5b167bd47a1ef2b25393e39692
Author: radhika <radhika at curoverse.com>
Date: Tue Mar 28 14:07:42 2017 -0400
3821: collection viewed from another object
diff --git a/apps/workbench/app/views/collections/_show_files.html.erb b/apps/workbench/app/views/collections/_show_files.html.erb
index 37d9283..b830347 100644
--- a/apps/workbench/app/views/collections/_show_files.html.erb
+++ b/apps/workbench/app/views/collections/_show_files.html.erb
@@ -27,10 +27,10 @@
'data-selection-action' => 'combine-collections',
'data-toggle' => 'dropdown'
%></li>
- <% if @object.editable? %>
+ <% if object.editable? %>
<li><%= link_to "Remove selected files", '#',
method: :post,
- 'data-href' => url_for(action: :remove_selected_files),
+ 'data-href' => url_for(controller: 'collections', action: :remove_selected_files),
'data-selection-param-name' => 'selection[]',
'data-selection-action' => 'remove-selected-files',
'data-toggle' => 'dropdown'
@@ -96,15 +96,15 @@
<span> </span>
<% end %>
- <% if @object.editable? %>
- <%= link_to({action: 'remove_selected_files', id: @object.uuid, selection: [object.portable_data_hash+'/'+file_path]}, method: :post, remote: true, data: {confirm: "Remove #{file_path}?", toggle: 'tooltip', placement: 'top'}, class: 'btn btn-sm btn-default btn-nodecorate', title: "Remove #{file_path}") do %>
+ <% if object.editable? %>
+ <%= link_to({controller: 'collections', action: 'remove_selected_files', id: object.uuid, selection: [object.portable_data_hash+'/'+file_path]}, method: :post, remote: true, data: {confirm: "Remove #{file_path}?", toggle: 'tooltip', placement: 'top'}, class: 'btn btn-sm btn-default btn-nodecorate', title: "Remove #{file_path}") do %>
<i class="fa fa-fw fa-trash-o"></i>
<% end %>
<% end %>
<% if CollectionsHelper::is_image(filename) %>
<i class="fa fa-fw fa-bar-chart-o"></i>
- <% if @object.editable? %>
- <%= render_editable_attribute @object, 'filename', filename, {'data-value' => file_path, 'data-toggle' => 'manual', 'selection_path' => 'rename-file-path:'+file_path} %>
+ <% if object.editable? %>
+ <%= render_editable_attribute object, 'filename', filename, {'data-value' => file_path, 'data-toggle' => 'manual', 'selection_path' => 'rename-file-path:'+file_path} %>
<% else %>
<%= filename %>
<% end %>
@@ -116,8 +116,8 @@
</div>
</div>
<% else %>
- <% if @object.editable? %>
- <i class="fa fa-fw fa-file"></i><%= render_editable_attribute @object, 'filename', filename, {'data-value' => file_path, 'data-toggle' => 'manual', 'selection_name' => 'rename-file-path:'+file_path} %>
+ <% if object.editable? %>
+ <i class="fa fa-fw fa-file"></i><%= render_editable_attribute object, 'filename', filename, {'data-value' => file_path, 'data-toggle' => 'manual', 'selection_name' => 'rename-file-path:'+file_path} %>
<% else %>
<i class="fa fa-fw fa-file" href="<%=object.uuid%>/<%=file_path%>" ></i> <%= filename %>
<% end %>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list