X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e5e28415e44e4b3cc1695ba827a1ebc0256fafdd..1b189a0961ba757caf6160285b59daa26c7cdcae:/apps/workbench/app/views/application/_choose.html.erb

diff --git a/apps/workbench/app/views/application/_choose.html.erb b/apps/workbench/app/views/application/_choose.html.erb
index d8d2032826..fc161397d2 100644
--- a/apps/workbench/app/views/application/_choose.html.erb
+++ b/apps/workbench/app/views/application/_choose.html.erb
@@ -2,16 +2,30 @@
   <div class="modal-dialog" style="width:80%">
     <div class="modal-content">
       <div class="modal-header">
-        <button type="button" class="close" onClick="reset_form()" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
         <h4 class="modal-title"><%= params[:title] || "Choose #{@objects.first.andand.class_for_display}" %></h4>
       </div>
 
       <div class="modal-body">
+        <% project_filters, chooser_filters = (params[:filters] || []).partition do |attr, op, val|
+             attr == "owner_uuid" and op == "="
+           end %>
         <div class="input-group">
           <% if params[:by_project].to_s != "false" %>
+            <% if project_filters.empty?
+                 selected_project_name = 'All projects'
+               else
+                 val = project_filters.last.last
+                 if val == current_user.uuid
+                   selected_project_name = "Home"
+                 else
+                   selected_project_name = Group.find(val).name rescue val
+                 end
+               end
+               %>
             <div class="input-group-btn" data-filterable-target=".modal.arv-choose .selectable-container">
               <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-                All projects <span class="caret"></span>
+                <%= selected_project_name %> <span class="caret"></span>
               </button>
               <ul class="dropdown-menu" role="menu">
                 <li>
@@ -37,19 +51,21 @@
         <div style="height: 1em" />
 
         <% preview_pane = (params[:preview_pane].to_s != "false")
-           pane_col_class = preview_pane ? "col-sm-6" : "col-sm-12" %>
+           pane_col_class = preview_pane ? "col-md-6" : "col-md-12" %>
         <div class="row" style="height: 20em">
-	  <div class="<%= pane_col_class %> container arv-filterable-list selectable-container <%= 'multiple' if multiple %>"
-	       style="height: 100%; overflow-y: scroll"
-	       data-infinite-scroller="#choose-scroll"
-	       id="choose-scroll"
-	       data-infinite-content-href="<%= next_page_href partial: true %>"
-	       data-infinite-content-href0="<%= url_for partial: true %>">
-	    <%= render partial: 'choose_rows' %>
-	  </div>
-          <% if preview_pane %>
-          <div class="col-sm-6 visible-md visible-lg modal-dialog-preview-pane" style="height: 100%; overflow-y: scroll">
+          <div class="<%= pane_col_class %> arv-filterable-list selectable-container <%= 'multiple' if multiple %>"
+               style="height: 100%; overflow-y: scroll"
+               data-infinite-scroller="#choose-scroll"
+               id="choose-scroll"
+               data-infinite-content-params-from-chooser="<%= {filters: chooser_filters}.to_json %>"
+               <% if project_filters.any? %>
+                 data-infinite-content-params-from-project-dropdown="<%= {filters: project_filters, project_uuid: project_filters.last.last}.to_json %>"
+               <% end %>
+               data-infinite-content-href="<%= url_for partial: true %>">
           </div>
+          <% if preview_pane %>
+            <div class="col-md-6 hidden-xs hidden-sm modal-dialog-preview-pane" style="height: 100%; overflow-y: scroll">
+            </div>
           <% end %>
         </div>