Download as
Browse Code »

Commit 4a0ed4755e85562be9ef79604c73e3c6c2fb11ac

Authored by Luciano Prestes
1 parent c1d16ff7
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

Search by acronym in software_infos search 

Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
Showing 2 changed files with 16 additions and 8 deletions   Show diff stats
lib/ext/search_controller.rb
  Diff comments   View file @4a0ed47
@@ -23,13 +23,7 @@ class SearchController @@ -23,13 +23,7 @@ class SearchController
23 @titles[:software_infos] = _("Software Catalog") 23 @titles[:software_infos] = _("Software Catalog")
24 @category_filters = [] 24 @category_filters = []
25 25
26 - if params[:filter].blank?  
27 - results = filter_communities_list{|community| community.software?}  
28 - else  
29 - params[:filter].split(",").each{|f| @category_filters << f.to_i}  
30 - results = filter_communities_list{|community| community.software? && !(community.category_ids & @category_filters).blank?}  
31 - end  
32 - 26 + results = filter_software_infos_list
33 results = results.paginate(:per_page => 24, :page => params[:page]) 27 results = results.paginate(:per_page => 24, :page => params[:page])
34 @searches[@asset] = {:results => results} 28 @searches[@asset] = {:results => results}
35 @search = results 29 @search = results
@@ -50,4 +44,18 @@ class SearchController @@ -50,4 +44,18 @@ class SearchController
50 end 44 end
51 communities_list 45 communities_list
52 end 46 end
  47 +
  48 + def filter_software_infos_list
  49 + unfiltered_software_infos_list = SoftwareInfo.like_search(params[:query])
  50 +
  51 + filtered_communities_list = []
  52 + unfiltered_software_infos_list.each{|software| filtered_communities_list << software.community}
  53 +
  54 + if not params[:filter].blank?
  55 + params[:filter].split(",").each{|f| @category_filters << f.to_i}
  56 + filtered_communities_list.select!{|community| !(community.category_ids & @category_filters).blank?}
  57 + end
  58 +
  59 + filtered_communities_list
  60 + end
53 end 61 end
lib/software_info.rb
  Diff comments   View file @4a0ed47
@@ -31,7 +31,7 @@ class SoftwareInfo &lt; ActiveRecord::Base @@ -31,7 +31,7 @@ class SoftwareInfo &lt; ActiveRecord::Base
31 31
32 # used on find_by_contents 32 # used on find_by_contents
33 scope :like_search, lambda{ |name| 33 scope :like_search, lambda{ |name|
34 - joins(:community).where("name ilike ?", "%#{name}%") 34 + joins(:community).where("name ILIKE ? OR acronym ILIKE ?", "%#{name}%", "%#{name}%")
35 } 35 }
36 36
37 scope :search, lambda { |name="", database_description_id = "", 37 scope :search, lambda { |name="", database_description_id = "",