From 5ff0efc1c95178863e3b4038dc44634907a5c37a Mon Sep 17 00:00:00 2001 From: Gabriela Navarro Date: Thu, 26 Mar 2015 14:48:53 +0000 Subject: [PATCH] Fix the ext search controller. Now it uses the full_text_search from the core --- lib/ext/search_controller.rb | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/lib/ext/search_controller.rb b/lib/ext/search_controller.rb index f172c03..a58b1e6 100644 --- a/lib/ext/search_controller.rb +++ b/lib/ext/search_controller.rb @@ -3,9 +3,11 @@ require_dependency 'search_controller' class SearchController def communities - results = filter_communities_list do |community| - !community.software? - end + @scope = visible_profiles(Community) + full_text_search + results = @searches[@asset][:results] + + results = results.each {|community| !community.software?} results = results.paginate(:per_page => 24, :page => params[:page]) @searches[@asset] = {:results => results} @search = results @@ -13,11 +15,15 @@ class SearchController def software_infos prepare_software_search_page - results = filter_software_infos_list + @scope = visible_profiles(Community) + full_text_search + results = @searches[@asset][:results] + + results = results.select {|community| community if community.software?} results = results.paginate(:per_page => @per_page, :page => params[:page]) @searches[@asset] = {:results => results} @search = results - @software_count = filter_software_infos_list.count + @software_count = results.count render :layout=>false if request.xhr? end -- libgit2 0.21.2