Commit bf5d9be38747807891170c80ef02f0b2b3b39a08
Exists in
master
and in
27 other branches
Merge remote-tracking branch 'origin/master'
Showing
1 changed file
with
3 additions
and
3 deletions
Show diff stats
app/controllers/public/search_controller.rb
... | ... | @@ -61,7 +61,7 @@ class SearchController < PublicController |
61 | 61 | end |
62 | 62 | |
63 | 63 | def articles |
64 | - @scope = @environment.articles.public | |
64 | + @scope = @environment.articles.public.paginate(paginate_options) | |
65 | 65 | full_text_search |
66 | 66 | end |
67 | 67 | |
... | ... | @@ -75,7 +75,7 @@ class SearchController < PublicController |
75 | 75 | end |
76 | 76 | |
77 | 77 | def products |
78 | - @scope = @environment.products | |
78 | + @scope = @environment.products.paginate(paginate_options) | |
79 | 79 | full_text_search |
80 | 80 | end |
81 | 81 | |
... | ... | @@ -238,7 +238,7 @@ class SearchController < PublicController |
238 | 238 | def visible_profiles(klass, *extra_relations) |
239 | 239 | relations = [:image, :domains, :environment, :preferred_domain] |
240 | 240 | relations += extra_relations |
241 | - @environment.send(klass.name.underscore.pluralize).visible.includes(relations) | |
241 | + @environment.send(klass.name.underscore.pluralize).visible.includes(relations).paginate(paginate_options) | |
242 | 242 | end |
243 | 243 | |
244 | 244 | def per_page | ... | ... |