projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '3342-pipeline-output-current-project' closes #3342
[arvados.git]
/
apps
/
workbench
/
app
/
views
/
collections
/
show_file_links.html.erb
diff --git
a/apps/workbench/app/views/collections/show_file_links.html.erb
b/apps/workbench/app/views/collections/show_file_links.html.erb
index 78d75b1f7949f871409057ca883afa3982d2a7f8..042e4ff71f7de8a7fca3f478e36950de6c3d99a0 100644
(file)
--- a/
apps/workbench/app/views/collections/show_file_links.html.erb
+++ b/
apps/workbench/app/views/collections/show_file_links.html.erb
@@
-38,7
+38,8
@@
Arvados. You can download individual files listed below. To download
the entire collection with wget, try:</p>
<pre>$ wget --mirror --no-parent --no-host --cut-dirs=3 <%=
the entire collection with wget, try:</p>
<pre>$ wget --mirror --no-parent --no-host --cut-dirs=3 <%=
- url_for(link_opts.merge(action: 'show_file_links', only_path: false))
+ url_for(link_opts.merge(action: 'show_file_links', only_path: false,
+ trailing_slash: true))
%></pre>
<h2>File Listing</h2>
%></pre>
<h2>File Listing</h2>
@@
-58,9
+59,7
@@
the entire collection with wget, try:</p>
<ul class="collection_files">
<% else %>
<%= link_to(filename,
<ul class="collection_files">
<% else %>
<%= link_to(filename,
- {controller: 'collections', action: 'show_file',
- uuid: @object.uuid, file: file_path,
- reader_token: params[:reader_token]},
+ link_opts.merge(file: file_path),
{title: "Download #{file_path}"}) %>
</li>
<% end %>
{title: "Download #{file_path}"}) %>
</li>
<% end %>