diff --git a/lib/ext/search_controller.rb b/lib/ext/search_controller.rb index ccfe7b0..1ca78b0 100644 --- a/lib/ext/search_controller.rb +++ b/lib/ext/search_controller.rb @@ -3,11 +3,10 @@ require_dependency 'search_controller' class SearchController def communities - @scope = visible_profiles(Community) - full_text_search - results = @searches[@asset][:results] - - results = results.each {|community| !community.institution?} + results = filter_communities_list do |community| + !community.institution? + end + results = results.paginate(:per_page => 24, :page => params[:page]) @searches[@asset] = {:results => results} @search = results end diff --git a/test/functional/search_controller_test.rb b/test/functional/search_controller_test.rb index 30da38f..ab45f06 100644 --- a/test/functional/search_controller_test.rb +++ b/test/functional/search_controller_test.rb @@ -35,7 +35,7 @@ class SearchControllerTest < ActionController::TestCase get :communities, :query => "New" assert_includes assigns(:searches)[:communities][:results], community - assert_not_includes assigns(:searches)[:communities][:results], institution + assert_not_includes assigns(:searches)[:communities][:results], institution.community end should "institutions_search don't have community" do @@ -51,10 +51,7 @@ class SearchControllerTest < ActionController::TestCase get :institutions, :query => "New" - assert_includes( - assigns(:searches)[:institutions][:results], - institution.community - ) + assert_includes assigns(:searches)[:institutions][:results], institution.community assert_not_includes assigns(:searches)[:institutions][:results], community end end -- libgit2 0.21.2