Download as
Browse Code »

Commit 43afd69f3ae5082b23e96df218569b93283a459e

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

Refactor extended SearchController 

Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
Showing 1 changed file with 14 additions and 23 deletions   Show diff stats
lib/ext/search_controller.rb
  Diff comments   View file @43afd69
@@ -3,20 +3,7 @@ require_dependency &#39;search_controller&#39; @@ -3,20 +3,7 @@ require_dependency &#39;search_controller&#39;
3 class SearchController 3 class SearchController
4 4
5 def communities 5 def communities
6 - unfiltered_list = visible_profiles(Community)  
7 - unless params[:query].nil?  
8 - unfiltered_list = unfiltered_list.select do |com|  
9 - com.name.downcase =~ /#{params[:query].downcase}/  
10 - end  
11 - end  
12 -  
13 - list_without_software_and_institution = []  
14 - unfiltered_list.each do |p|  
15 - if p.class == Community and !p.software? and !p.institution?  
16 - list_without_software_and_institution << p  
17 - end  
18 - end  
19 - results = list_without_software_and_institution 6 + results = filter_communities_list{|community| !community.software? and !community.institution?}
20 results = results.paginate(:per_page => 24, :page => params[:page]) 7 results = results.paginate(:per_page => 24, :page => params[:page])
21 @searches[@asset] = {:results => results} 8 @searches[@asset] = {:results => results}
22 @search = results 9 @search = results
@@ -24,22 +11,26 @@ class SearchController @@ -24,22 +11,26 @@ class SearchController
24 11
25 def software_infos 12 def software_infos
26 @titles[:software_infos] = "Software Infos" 13 @titles[:software_infos] = "Software Infos"
  14 +
  15 + results = filter_communities_list{|community| community.software?}
  16 + results = results.paginate(:per_page => 24, :page => params[:page])
  17 + @searches[@asset] = {:results => results}
  18 + @search = results
  19 + end
  20 +
  21 + def filter_communities_list
27 unfiltered_list = visible_profiles(Community) 22 unfiltered_list = visible_profiles(Community)
28 unless params[:query].nil? 23 unless params[:query].nil?
29 unfiltered_list = unfiltered_list.select do |com| 24 unfiltered_list = unfiltered_list.select do |com|
30 com.name.downcase =~ /#{params[:query].downcase}/ 25 com.name.downcase =~ /#{params[:query].downcase}/
31 end 26 end
32 end 27 end
33 -  
34 - list_community_of_software = []  
35 - unfiltered_list.each do |p|  
36 - if p.class == Community and p.software?  
37 - list_community_of_software << p 28 + communities_list = []
  29 + unfiltered_list.each do |profile|
  30 + if profile.class == Community and yield(profile)
  31 + communities_list << profile
38 end 32 end
39 end 33 end
40 - results = list_community_of_software  
41 - results = results.paginate(:per_page => 24, :page => params[:page])  
42 - @searches[@asset] = {:results => results}  
43 - @search = results 34 + communities_list
44 end 35 end
45 end 36 end
46 \ No newline at end of file 37 \ No newline at end of file