X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/9e24edb1d9624b6aed38464c70cab5027586abbc..6f69b8a9314ca4041291411d7a3c57686399e9e5:/apps/workbench/app/views/projects/_show_tab_contents.html.erb

diff --git a/apps/workbench/app/views/projects/_show_tab_contents.html.erb b/apps/workbench/app/views/projects/_show_tab_contents.html.erb
index e95ba72077..4d19cbdca3 100644
--- a/apps/workbench/app/views/projects/_show_tab_contents.html.erb
+++ b/apps/workbench/app/views/projects/_show_tab_contents.html.erb
@@ -2,7 +2,7 @@
   <div class="row">
     <div class="col-sm-5">
       <div class="btn-group btn-group-sm">
-        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Selection... <i class="fa fa-fw fa-long-arrow-down "></i></button>
+        <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 "Compare selected", '#',
                   'data-href' => compare_pipeline_instances_path,
@@ -15,34 +15,34 @@
                   'data-selection-action' => 'remove',
                   'data-remote' => true,
                   'method' => 'delete'
+            %></li>
+	          <li><%= link_to "Move selected", '#',
+            		  'data-href' => choose_projects_path(
+                                   title: 'Move to...',
+                                   editable: true,
+                                   action_name: 'Move',
+                                   action_href: move_items_project_path,
+                                   action_method: 'get',
+                                   action_data: {selection_param: 'target',
+                                                 success: 'page-refresh'}.to_json),
+                  'data-remote' => true,
+                  'data-selection-param-name' => 'move_items[]',
+		              'data-selection-action' => 'move'
             %></li>
         </ul>
       </div>
     </div>
     <div class="col-sm-4 pull-right">
-      <input type="text" class="form-control filterable-control" placeholder="Search project contents" data-filterable-target="table.arv-index.arv-project-contents tbody"/>
+      <input type="text" class="form-control filterable-control" placeholder="Search project contents" data-filterable-target="table.arv-index.arv-project-<%= tab_name %> tbody"/>
     </div>
   </div>
 
-  <%
-    selected_objects_and_names = []
-    specific_data_kinds = ['arvados#collection', 'arvados#group', 'arvados#job', 'arvados#pipelineInstance', 'arvados#pipelineTemplate']
-    @objects_and_names.each do |object, name_link|
-      if !data_kind.any? && !specific_data_kinds.include?(object.kind)
-        selected_objects_and_names << [object, name_link]
-      elsif data_kind.include?(object.kind)
-        selected_objects_and_names << [object, name_link]
-      end
-    end
-  %>
-
-  <table class="table table-condensed table-fixedlayout arv-index arv-project-contents" style="overflow-x: hidden">
+  <table class="table table-condensed table-fixedlayout arv-index arv-project-<%= tab_name %>" style="overflow-x: hidden">
     <colgroup>
       <col width="40%" />
       <col width="60%" />
     </colgroup>
-    <tbody data-infinite-scroller="#Contents-scroll" data-infinite-content-href="<%= url_for(format: :json, partial: :contents_rows, offset: next_page_offset) if next_page_offset %>">
-      <%= render partial: 'show_contents_rows', locals: {project: @object, objects_and_names: selected_objects_and_names} %>
+    <tbody data-infinite-scroller="#<%= tab_name %>-scroll" data-infinite-content-href="<%= url_for partial: :contents_rows, filters: filters.to_json %>">
     </tbody>
     <thead>
       <tr>
@@ -54,5 +54,4 @@
       </tr>
     </thead>
   </table>
-
 </div>