Download as
Browse Code »

Commit adc7e9beb80645bb76bd1fe78ff5abf96281255e

Authored by Tallys Martins
1 parent 6129c293
Exists in master and in 35 other branches add_sisp_to_chef, add_super_archives_plugin, automates_core_packing, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_merge_request_url, fix_no_license, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_sym_links_noosfero, lxc_settings, mezuro_cookbook, refactor_download_block, remove_broken_theme, remove_sisp_buttons, sisp_catalog_header, software_communities_html_refactor, software_infos_api, spb_to_rails4, stable-4.1, stable-4.2, theme_header, theme_javascript_refactory, update_search_by_categories

Multi env on SoftwareInfo scope search_by_query 

Signed-off-by: Tallys Martins <tallysmartins@yahoo.com.br>
Showing 3 changed files with 20 additions and 4 deletions   Show diff stats
src/noosfero-spb/software_communities/lib/ext/search_controller.rb
  Diff comments   View file @adc7e9b
@@ -89,10 +89,11 @@ class SearchController @@ -89,10 +89,11 @@ class SearchController
89 params[:query] ||= "" 89 params[:query] ||= ""
90 visible_communities = visible_profiles(Community) 90 visible_communities = visible_profiles(Community)
91 91
92 - filtered_software_list = SoftwareInfo.search_by_query(params[:query]) 92 + filtered_software_list = SoftwareInfo.search_by_query(params[:query], environment)
93 93
94 if params[:only_softwares] 94 if params[:only_softwares]
95 params[:only_softwares].collect!{ |software_name| software_name.to_slug } 95 params[:only_softwares].collect!{ |software_name| software_name.to_slug }
  96 + #FIX-ME: This query is not appropriate
96 filtered_software_list = SoftwareInfo.all.select{ |s| params[:only_softwares].include?(s.identifier) } 97 filtered_software_list = SoftwareInfo.all.select{ |s| params[:only_softwares].include?(s.identifier) }
97 @public_software_selected = false 98 @public_software_selected = false
98 end 99 end
src/noosfero-spb/software_communities/lib/software_info.rb
  Diff comments   View file @adc7e9b
@@ -13,15 +13,15 @@ class SoftwareInfo &lt; ActiveRecord::Base @@ -13,15 +13,15 @@ class SoftwareInfo &lt; ActiveRecord::Base
13 DatabaseDescription 13 DatabaseDescription
14 ] 14 ]
15 15
16 - scope :search_by_query, lambda { |query = ""| 16 + scope :search_by_query, lambda { |query = "", env = Environment.default|
17 filtered_query = query.gsub(/[\|\(\)\\\/\s\[\]'"*%&!:]/,' ').split.map{|w| w += ":*"}.join('|') 17 filtered_query = query.gsub(/[\|\(\)\\\/\s\[\]'"*%&!:]/,' ').split.map{|w| w += ":*"}.join('|')
18 search_fields = SoftwareInfo.pg_search_plugin_fields 18 search_fields = SoftwareInfo.pg_search_plugin_fields
19 19
20 if query.empty? 20 if query.empty?
21 - SoftwareInfo.joins(:community).where("profiles.visible = ?", true) 21 + SoftwareInfo.joins(:community).where("profiles.visible = ? AND environment_id = ? ", true, env.id)
22 else 22 else
23 searchable_software_objects = SoftwareInfo.transform_list_in_methods_list(SEARCHABLE_SOFTWARE_CLASSES) 23 searchable_software_objects = SoftwareInfo.transform_list_in_methods_list(SEARCHABLE_SOFTWARE_CLASSES)
24 - includes(searchable_software_objects).where("to_tsvector('simple', #{search_fields}) @@ to_tsquery('#{filtered_query}')").where("profiles.visible = ?", true) 24 + includes(searchable_software_objects).where("to_tsvector('simple', #{search_fields}) @@ to_tsquery('#{filtered_query}')").where("profiles.visible = ? AND environment_id = ?", true, env.id)
25 end 25 end
26 } 26 }
27 27
src/noosfero-spb/software_communities/test/unit/software_info_test.rb
  Diff comments   View file @adc7e9b
@@ -41,4 +41,19 @@ class SoftwareInfoValidationTest &lt; ActiveSupport::TestCase @@ -41,4 +41,19 @@ class SoftwareInfoValidationTest &lt; ActiveSupport::TestCase
41 assert_equal @software_info.license_info.link, another_license_link 41 assert_equal @software_info.license_info.link, another_license_link
42 end 42 end
43 43
  44 + should "search softwares on the correct environment when multi environments available" do
  45 + software_info = create_software_info("soft1")
  46 + another_software_info = create_software_info("soft2")
  47 + other_env = Environment.create!(name: "sisp")
  48 + another_soft_profile = another_software_info.community
  49 + another_soft_profile.environment_id = other_env.id
  50 + another_soft_profile.save
  51 +
  52 + assert_equal 2, SoftwareInfo.count
  53 + assert_equal 1, SoftwareInfo.search_by_query("", Environment.default).count
  54 + assert_equal software_info, SoftwareInfo.search_by_query("", Environment.default).first
  55 + assert_equal 1, SoftwareInfo.search_by_query("", other_env).count
  56 + assert_equal true, SoftwareInfo.search_by_query("", other_env).includes?(another_software_info)
  57 + end
  58 +
44 end 59 end