projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
4363: Merge branch 'master' into 4363-less-filename-munging
[arvados.git]
/
apps
/
workbench
/
app
/
views
/
collections
/
_show_recent.html.erb
diff --git
a/apps/workbench/app/views/collections/_show_recent.html.erb
b/apps/workbench/app/views/collections/_show_recent.html.erb
index 221e0aa7797de568cf6887b2e95acdb81005c7d1..6ebb3b2a28e67632b134959e612be7fa8c319637 100644
(file)
--- a/
apps/workbench/app/views/collections/_show_recent.html.erb
+++ b/
apps/workbench/app/views/collections/_show_recent.html.erb
@@
-4,11
+4,11
@@
<div class="btn-group btn-group-sm">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Selection... <span class="caret"></span></button>
<ul class="dropdown-menu" role="menu">
<div class="btn-group btn-group-sm">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Selection... <span class="caret"></span></button>
<ul class="dropdown-menu" role="menu">
- <li><%= link_to "C
ombine selections into a new collection", '/combine_selected
',
- 'data-href' =>
url_for('/combine_selected')
,
+ <li><%= link_to "C
reate new collection with selected collections", '#
',
+ 'data-href' =>
combine_selected_path
,
'data-selection-param-name' => 'selection[]',
'data-selection-action' => 'combine-collections',
'data-selection-param-name' => 'selection[]',
'data-selection-action' => 'combine-collections',
- '
data-remote' => true
,
+ '
method' => 'post'
,
'data-toggle' => 'dropdown'
%></li>
</ul>
'data-toggle' => 'dropdown'
%></li>
</ul>
@@
-17,7
+17,7
@@
</div>
<p/>
</div>
<p/>
-<%= render partial: "paging", locals: {results: @
collection
s, object: @object} %>
+<%= render partial: "paging", locals: {results: @
object
s, object: @object} %>
<div style="padding-right: 1em">
<div style="padding-right: 1em">
@@
-49,7
+49,7
@@
</div>
</div>
-<%= render partial: "paging", locals: {results: @
collection
s, object: @object} %>
+<%= render partial: "paging", locals: {results: @
object
s, object: @object} %>
<% content_for :footer_js do %>
$(document).on('click', 'form[data-remote] input[type=submit]', function() {
<% content_for :footer_js do %>
$(document).on('click', 'form[data-remote] input[type=submit]', function() {