Fix 2.4.2 upgrade notes formatting refs #19330

[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 9573f6e8a8014dc0e46bf6f21ffcd35033022898..037c0bf33735602c263f4666ab2c55bc6eef2475 100644 (file)
--- a/apps/workbench/app/views/collections/_show_recent.html.erb
+++ b/apps/workbench/app/views/collections/_show_recent.html.erb
@@ -1,14 +1,18 @@
+<%# Copyright (C) The Arvados Authors. All rights reserved.
+
+SPDX-License-Identifier: AGPL-3.0 %>
+
 <div class="selection-action-container" style="padding-left: 1em">
   <div class="row">
     <div class="pull-left">
       <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 "Combine selections into a new collection", '/combine_selected',
-                  'data-href' => url_for('/combine_selected'),
+          <li><%= link_to "Create new collection with selected collections", '#',
+                  method: :post,
+                  'data-href' => combine_selected_path,
                   'data-selection-param-name' => 'selection[]',
-                  'data-selection-action' => 'combine',
-                  'data-remote' => true,
+                  'data-selection-action' => 'combine-collections',
                   'data-toggle' => 'dropdown'
             %></li>
         </ul>
@@ -17,45 +21,45 @@
   </div>
   <p/>
 
-  <%= render partial: "paging", locals: {results: @collections, object: @object} %>
-
-  <div style="padding-right: 1em">
-
-  <%= form_tag do |f| %>
-
-  <table id="collections-index" class="topalign table table-condensed table-fixedlayout"> <!-- table-fixed-header-row -->
-    <colgroup>
-      <col width="10%" />
-      <col width="10%" />
-      <col width="40%" />
-      <col width="10%" />
-      <col width="30%" />
-    </colgroup>
-    <thead>
-      <tr class="contain-align-left">
-        <th></th>
-        <th>uuid</th>
-        <th>contents</th>
-        <th>created at</th>
-        <th>tags</th>
-      </tr>
-    </thead>
-    <tbody>
-      <%= render partial: 'index_tbody' %>
-    </tbody>
-  </table>
-
-  <% end %>
+<%= render partial: "paging", locals: {results: @objects, object: @object} %>
 
-  </div>
+<div style="padding-right: 1em">
+
+<%= form_tag do |f| %>
+
+<table id="collections-index" class="topalign table table-condensed table-fixedlayout"> <!-- table-fixed-header-row -->
+  <colgroup>
+    <col width="10%" />
+    <col width="10%" />
+    <col width="40%" />
+    <col width="10%" />
+    <col width="30%" />
+  </colgroup>
+  <thead>
+    <tr class="contain-align-left">
+      <th></th>
+      <th>uuid</th>
+      <th>contents</th>
+      <th>created at</th>
+      <th>tags</th>
+    </tr>
+  </thead>
+  <tbody>
+    <%= render partial: 'index_tbody' %>
+  </tbody>
+</table>
+
+<% end %>
+
+</div>
 
-  <%= render partial: "paging", locals: {results: @collections, object: @object} %>
+<%= render partial: "paging", locals: {results: @objects, object: @object} %>
 
-  <% content_for :footer_js do %>
-  $(document).on('click', 'form[data-remote] input[type=submit]', function() {
-    $('table#collections-index tbody').fadeTo(200, 0.3);
-    return true;
-  });
-  <% end %>
+<% content_for :footer_js do %>
+$(document).on('click', 'form[data-remote] input[type=submit]', function() {
+  $('table#collections-index tbody').fadeTo(200, 0.3);
+  return true;
+});
+<% end %>
 
 </div>