Download as
Browse Code »

Commit 669e02224368b13c0d82953fd4b77e136bddce6c

Authored by Fabio Teixeira
Committed by Gabriela Navarro
1 parent 0b1b40e0
Exists in master and in 54 other branches add_you_are_here_breadcrumbs_label, api_for_colab, backup_not_prod, create_institution_bootstrap_modal, design_validation, dev_env_minimal, disable_email_dev, fix_edit_software_permission, fix_edit_software_with_another_license, fix_hover_button_whitening, fix_members_pagination, fix_models_translations, fix_software_api, fix_software_block_migration, fix_validations_and_tests, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc, margin_fix, mezuro_cookbook, organization_rating_style_changes, prezento, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_secondary_email_from_user, removing_super_archives_email, review_message, scope2method, signals_community_noosfero, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_improvements, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_catalog_style_fixes, spb_minimal_env, spec_refactor, stable-4.x, temp_soft_comm_refactoring, thread_dropdown, thread_page, update_software_api, update_softwares_boxes

Adjust to search only in the children of software category 

- Also fix small break line bug on search option

Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
Showing 3 changed files with 13 additions and 2 deletions   Show diff stats
lib/ext/category.rb
  Diff comments   View file @669e022
@@ -14,9 +14,19 @@ class Category @@ -14,9 +14,19 @@ class Category
14 _('Education'), 14 _('Education'),
15 _('Government and Politics'), 15 _('Government and Politics'),
16 _('Justice and Legislation'), 16 _('Justice and Legislation'),
17 - _('International Relationships') 17 + _('International Relationships'),
  18 + _('Transportation and Transit')
18 ] 19 ]
19 20
  21 + scope :software_categories, lambda {
  22 + software_category = Category.find_by_name("Software")
  23 + if software_category.nil?
  24 + []
  25 + else
  26 + software_category.children
  27 + end
  28 + }
  29 +
20 def software_infos 30 def software_infos
21 software_list = self.communities 31 software_list = self.communities
22 software_list.collect { |x| software_list.delete(x) unless x.software? } 32 software_list.collect { |x| software_list.delete(x) unless x.software? }
lib/ext/search_controller.rb
  Diff comments   View file @669e022
@@ -78,7 +78,7 @@ class SearchController @@ -78,7 +78,7 @@ class SearchController
78 def prepare_software_search_page 78 def prepare_software_search_page
79 @titles[:software_infos] = _("Public Software Catalog") 79 @titles[:software_infos] = _("Public Software Catalog")
80 @category_filters = [] 80 @category_filters = []
81 - @categories = Category.all 81 + @categories = Category.software_categories
82 @selected_categories = params[:selected_categories] 82 @selected_categories = params[:selected_categories]
83 @selected_categories ||= [] 83 @selected_categories ||= []
84 @selected_categories = @selected_categories.map(&:to_i) 84 @selected_categories = @selected_categories.map(&:to_i)
views/search/_catalog_filter.html.erb
  Diff comments   View file @669e022
@@ -26,6 +26,7 @@ @@ -26,6 +26,7 @@
26 <%= _("#{category.name}") %> 26 <%= _("#{category.name}") %>
27 </label> <br> 27 </label> <br>
28 <% end %> 28 <% end %>
  29 + <br />
29 </div> 30 </div>
30 </div> 31 </div>
31 32