X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/c51634cad3c68d0a8400f1b1c47da9eef5307e06..33e6d3356af3f7eaa484dbaa7a671aa25f5042e4:/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 f185abe69e..b3b599329f 100644
--- a/apps/workbench/app/views/projects/_show_tab_contents.html.erb
+++ b/apps/workbench/app/views/projects/_show_tab_contents.html.erb
@@ -1,25 +1,30 @@
+<% sortable_columns = {} if local_assigns[:sortable_columns].nil? %>
 <div class="selection-action-container">
   <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... <span class="caret"></span></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">
+          <% if current_user.andand.is_active %>
           <li><%= link_to "Create new collection with selected collections", '#',
                   'data-href' => combine_selected_path(
-                    action_data: {selection_param: 'project'}.to_json
+                    action_data: {current_project_uuid: @object.uuid}.to_json
                   ),
                   'id' => 'combine_selections_button',
+                  method: :post,
                   'data-selection-param-name' => 'selection[]',
                   'data-selection-action' => 'combine-project-contents',
-                  'method' => 'post',
                   'data-toggle' => 'dropdown'
             %></li>
-          <li><%= link_to "Compare selected", 'action',
+          <% end %>
+          <li><%= link_to "Compare selected", '#',
                   'data-href' => compare_pipeline_instances_path,
                   'data-selection-param-name' => 'uuids[]',
-                  'data-selection-action' => 'compare'
+                  'data-selection-action' => 'compare',
+                  'data-toggle' => 'dropdown'
             %></li>
-          <li><%= link_to "Copy selected", '#',
+          <% if current_user.andand.is_active %>
+          <li><%= link_to "Copy selected...", '#',
                   'data-href' => choose_projects_path(
                     title: 'Copy selected items to...',
                     editable: true,
@@ -33,9 +38,12 @@
                       success: 'page-refresh'}.to_json),
                   'data-remote' => true,
                   'data-selection-param-name' => 'selection[]',
-                  'data-selection-action' => 'copy'
+                  'data-selection-action' => 'copy',
+                  'data-toggle' => 'dropdown'
             %></li>
-          <li><%= link_to "Move selected", '#',
+          <% end %>
+          <% if @object.editable? %>
+          <li><%= link_to "Move selected...", '#',
                   'data-href' => choose_projects_path(
                     title: 'Move selected items to...',
                     editable: true,
@@ -49,16 +57,18 @@
                       success: 'page-refresh'}.to_json),
                   'data-remote' => true,
                   'data-selection-param-name' => 'selection[]',
-                  'data-selection-action' => 'move'
+                  'data-selection-action' => 'move',
+                  'data-toggle' => 'dropdown'
             %></li>
           <li><%= link_to "Remove selected", '#',
+                  method: :delete,
                   'data-href' => url_for(action: :remove_items),
                   'data-selection-param-name' => 'item_uuids[]',
                   'data-selection-action' => 'remove',
                   'data-remote' => true,
-                  'method' => 'delete',
                   'data-toggle' => 'dropdown'
             %></li>
+          <% end %>
         </ul>
       </div>
     </div>
@@ -75,15 +85,25 @@
       <col width="60%" style="width: 60%;" />
       <col width="40%" style="width: 40%;" />
     </colgroup>
-    <tbody data-infinite-scroller="#<%= tab_pane %>-scroll" data-infinite-content-href="<%= url_for partial: :contents_rows %>" data-infinite-content-params-projecttab="<%= {filters: filters}.to_json %>">
+    <tbody data-infinite-scroller="#<%= tab_pane %>-scroll" data-infinite-content-href="<%= url_for partial: :contents_rows %>" data-infinite-content-params-projecttab="<%= local_assigns.select{|k| [:order, :limit, :filters].include? k }.to_json %>" data-infinite-content-params-attr="projecttab">
     </tbody>
     <thead>
       <tr>
         <th></th>
         <th></th>
         <th></th>
-        <th>name</th>
-        <th>description</th>
+        <% sort_order = sortable_columns['name'].gsub(/\s/,'') if sortable_columns['name'] %>
+        <th <% if !sort_order.nil? %>
+              data-sort-order='<%= sort_order %>'
+            <% end %> >
+          name
+        </th>
+        <% sort_order = sortable_columns['description'].gsub(/\s/,'') if sortable_columns['description'] %>
+        <th <% if !sort_order.nil? %>
+              data-sort-order='<%= sort_order %>'
+            <% end %> >
+          description
+        </th>
       </tr>
     </thead>
   </table>