X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f12350f25275fbf4c6c8692122f5eacce89794ee..136f77bed67bd349fb73053379dcb7bae6a16592:/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 27ea600446..fc161397d2 100644
--- a/apps/workbench/app/views/application/_choose.html.erb
+++ b/apps/workbench/app/views/application/_choose.html.erb
@@ -7,16 +7,19 @@
       </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" %>
-            <% selected_project_name = 'All projects'
-               @filters.andand.each do |attr, op, val|
-                 if attr == 'owner_uuid' and op == '='
-                   if val == current_user.uuid
-                     selected_project_name = "Home"
-                   else
-                     selected_project_name = Group.find(val).name rescue val
-                   end
+            <% 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
                %>
@@ -54,7 +57,10 @@
                style="height: 100%; overflow-y: scroll"
                data-infinite-scroller="#choose-scroll"
                id="choose-scroll"
-               data-infinite-content-params-from-chooser="<%= {filters: params[:filters] || []}.to_json %>"
+               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 %>