Download as
Browse Code »

Commit c489251bf4383c07e9e2f8db313108406435048c

Authored by Luciano Prestes
Committed by Thiago Ribeiro
1 parent 5ffa5a41
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 software_infos find only softwares with visible community

Showing 2 changed files with 20 additions and 0 deletions   Show diff stats
lib/ext/search_controller.rb
  Diff comments   View file @c489251
@@ -61,6 +61,7 @@ class SearchController @@ -61,6 +61,7 @@ class SearchController
61 61
62 def get_filtered_software_list 62 def get_filtered_software_list
63 params[:query] ||= "" 63 params[:query] ||= ""
  64 + visible_communities = visible_profiles(Community)
64 65
65 filtered_software_list = SoftwareInfo.search_by_query(params[:query]) 66 filtered_software_list = SoftwareInfo.search_by_query(params[:query])
66 67
@@ -70,6 +71,7 @@ class SearchController @@ -70,6 +71,7 @@ class SearchController
70 @public_software_selected = false 71 @public_software_selected = false
71 end 72 end
72 73
  74 + filtered_software_list.select!{ |software| visible_communities.include?(software.community) }
73 category_ids = get_filter_category_ids 75 category_ids = get_filter_category_ids
74 76
75 unless category_ids.empty? 77 unless category_ids.empty?
test/functional/search_controller_test.rb
  Diff comments   View file @c489251
@@ -214,6 +214,7 @@ class SearchControllerTest < ActionController::TestCase @@ -214,6 +214,7 @@ class SearchControllerTest < ActionController::TestCase
214 assert_not_includes assigns(:searches)[:software_infos][:results], software_one.community 214 assert_not_includes assigns(:searches)[:software_infos][:results], software_one.community
215 end 215 end
216 216
  217 +<<<<<<< 5ffa5a412be43c8ca9d1a07ed84a55503bb1a3fd
217 should "software_infos search return only enabled softwares" do 218 should "software_infos search return only enabled softwares" do
218 s1 = SoftwareInfo.first 219 s1 = SoftwareInfo.first
219 s2 = SoftwareInfo.last 220 s2 = SoftwareInfo.last
@@ -239,6 +240,23 @@ class SearchControllerTest &lt; ActionController::TestCase @@ -239,6 +240,23 @@ class SearchControllerTest &lt; ActionController::TestCase
239 assert_not_includes assigns(:searches)[:software_infos][:results], s2.community 240 assert_not_includes assigns(:searches)[:software_infos][:results], s2.community
240 end 241 end
241 242
  243 + should "software_infos search not return software with secret community" do
  244 + software_one = create_software_info("Software ABC", :acronym => "SFO", :finality => "Help")
  245 + software_two = create_software_info("Python", :acronym => "SFT", :finality => "Task")
  246 + software_three = create_software_info("Software DEF", :acronym => "SFW", :finality => "Java")
  247 +
  248 + software_one.community.secret = true
  249 + software_one.community.save!
  250 +
  251 + get(
  252 + :software_infos,
  253 + )
  254 +
  255 + assert_includes assigns(:searches)[:software_infos][:results], software_two.community
  256 + assert_includes assigns(:searches)[:software_infos][:results], software_three.community
  257 + assert_not_includes assigns(:searches)[:software_infos][:results], software_one.community
  258 + end
  259 +
242 private 260 private
243 261
244 def create_software_categories 262 def create_software_categories