projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'main' from workbench2.git
[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..80f3ff117a583c3e6b96df76b08f6d75e5dc4cd9 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
class SearchController < ApplicationController
+ skip_before_action :ensure_arvados_api_exists
+
def find_objects_for_index
search_what = Group
if params[:project_uuid]
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,
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
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
end
end