[noosfero/noosfero][master] Revert "search: on crash, don't let exception load all data"

[Bráulio Bhavamitra]

Bráulio Bhavamitra pushed to master at Noosfero / noosfero


Commits:
01024be2 by Braulio Bhavamitra at 2015-03-27T20:06:56Z
Revert "search: on crash, don't let exception load all data"

This reverts commit 82742464704b48dce6337fa31610da3db7a6bce4.
This commit broke searches pagination when using solr

- - - - -


1 changed file:

- app/controllers/public/search_controller.rb


Changes:

=====================================
app/controllers/public/search_controller.rb
=====================================
--- a/app/controllers/public/search_controller.rb
+++ b/app/controllers/public/search_controller.rb
@@ -61,7 +61,7 @@ class SearchController < PublicController
   end
 
   def articles
-    @scope = @environment.articles.public.paginate(paginate_options)
+    @scope = @environment.articles.public
     full_text_search
   end
 
@@ -75,7 +75,7 @@ class SearchController < PublicController
   end
 
   def products
-    @scope = @environment.products.paginate(paginate_options)
+    @scope = @environment.products
     full_text_search
   end
 
@@ -238,7 +238,7 @@ class SearchController < PublicController
   def visible_profiles(klass, *extra_relations)
     relations = [:image, :domains, :environment, :preferred_domain]
     relations += extra_relations
-    @environment.send(klass.name.underscore.pluralize).visible.includes(relations).paginate(paginate_options)
+    @environment.send(klass.name.underscore.pluralize).visible.includes(relations)
   end
 
   def per_page


View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/01024be25b6399b65963395ff36af137489ff33a
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20150327/feb3d619/attachment-0001.html>