Download as
Browse Code »

Commit 5ff0efc1c95178863e3b4038dc44634907a5c37a

Authored by Gabriela Navarro
Committed by Arthur Esposte
1 parent d14f0ea0
Exists in master and in 79 other branches add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev_env_minimal, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, prezento, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, update_software_api, update_softwares_boxes

Fix the ext search controller. Now it uses the full_text_search from the 

core

Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>

Conflicts:
	lib/ext/search_controller.rb
Showing 1 changed file with 11 additions and 5 deletions   Show diff stats
lib/ext/search_controller.rb
  Diff comments   View file @5ff0efc
... ... @@ -3,9 +3,11 @@ require_dependency &#39;search_controller&#39;
3 3 class SearchController
4 4  
5 5 def communities
6   - results = filter_communities_list do |community|
7   - !community.software?
8   - end
  6 + @scope = visible_profiles(Community)
  7 + full_text_search
  8 + results = @searches[@asset][:results]
  9 +
  10 + results = results.each {|community| !community.software?}
9 11 results = results.paginate(:per_page => 24, :page => params[:page])
10 12 @searches[@asset] = {:results => results}
11 13 @search = results
... ... @@ -13,11 +15,15 @@ class SearchController
13 15  
14 16 def software_infos
15 17 prepare_software_search_page
16   - results = filter_software_infos_list
  18 + @scope = visible_profiles(Community)
  19 + full_text_search
  20 + results = @searches[@asset][:results]
  21 +
  22 + results = results.select {|community| community if community.software?}
17 23 results = results.paginate(:per_page => @per_page, :page => params[:page])
18 24 @searches[@asset] = {:results => results}
19 25 @search = results
20   - @software_count = filter_software_infos_list.count
  26 + @software_count = results.count
21 27 render :layout=>false if request.xhr?
22 28 end
23 29  
... ...