projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '11509-keep-web-cors-range'
[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..2511ab08188fbb4aa2e17d250b1feecafff03bd9 100644
(file)
--- a/
apps/workbench/app/controllers/search_controller.rb
+++ b/
apps/workbench/app/controllers/search_controller.rb
@@
-15,12
+15,16
@@
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)
+ 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],
+ count: 'none',
+ filters: @filters.to_json)
end
end
end
end