Download as
Browse Code »

Commit bf5d9be38747807891170c80ef02f0b2b3b39a08

Authored by Weblate
2 parents 636e4d79 82742464
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

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
  Diff comments   View file @bf5d9be
@@ -61,7 +61,7 @@ class SearchController < PublicController @@ -61,7 +61,7 @@ class SearchController < PublicController
61 end 61 end
62 62
63 def articles 63 def articles
64 - @scope = @environment.articles.public 64 + @scope = @environment.articles.public.paginate(paginate_options)
65 full_text_search 65 full_text_search
66 end 66 end
67 67
@@ -75,7 +75,7 @@ class SearchController < PublicController @@ -75,7 +75,7 @@ class SearchController < PublicController
75 end 75 end
76 76
77 def products 77 def products
78 - @scope = @environment.products 78 + @scope = @environment.products.paginate(paginate_options)
79 full_text_search 79 full_text_search
80 end 80 end
81 81
@@ -238,7 +238,7 @@ class SearchController < PublicController @@ -238,7 +238,7 @@ class SearchController < PublicController
238 def visible_profiles(klass, *extra_relations) 238 def visible_profiles(klass, *extra_relations)
239 relations = [:image, :domains, :environment, :preferred_domain] 239 relations = [:image, :domains, :environment, :preferred_domain]
240 relations += extra_relations 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 end 242 end
243 243
244 def per_page 244 def per_page