Merge branch 'master' into 13773-will-fail-container-status

[arvados.git] / apps / workbench / app / controllers / search_controller.rb

diff --git a/apps/workbench/app/controllers/search_controller.rb b/apps/workbench/app/controllers/search_controller.rb
index 6f209a5a9e0d11fc0a1a0fbaab0b6fe8b47834cc..3775abd1ae9f1117926d7bde8c847fc32ad0cd60 100644 (file)
--- a/apps/workbench/app/controllers/search_controller.rb
+++ b/apps/workbench/app/controllers/search_controller.rb
@@ -1,4 +1,10 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
 class SearchController < ApplicationController
+  skip_before_filter :ensure_arvados_api_exists
+
   def find_objects_for_index
     search_what = Group
     if params[:project_uuid]
@@ -15,12 +21,18 @@ class SearchController < ApplicationController
     end
     @objects = search_what.contents(limit: @limit,
                                     offset: @offset,
-                                    filters: @filters,
-                                    include_linked: true)
+                                    recursive: true,
+                                    count: 'none',
+                                    last_object_class: params["last_object_class"],
+                                    filters: @filters)
     super
   end
 
   def next_page_href with_params={}
-    super with_params.merge(last_object_class: @objects.last.class.to_s)
+    super with_params.merge(last_object_class: @objects.last.class.to_s,
+                            project_uuid: params[:project_uuid],
+                            recursive: true,
+                            count: 'none',
+                            filters: @filters.to_json)
   end
 end