Download as
Browse Code »

Commit 669e02224368b13c0d82953fd4b77e136bddce6c

Authored by Fabio Teixeira
Committed by Gabriela Navarro
1 parent 0b1b40e0
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

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 14 _('Education'),
15 15 _('Government and Politics'),
16 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 30 def software_infos
21 31 software_list = self.communities
22 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 78 def prepare_software_search_page
79 79 @titles[:software_infos] = _("Public Software Catalog")
80 80 @category_filters = []
81   - @categories = Category.all
  81 + @categories = Category.software_categories
82 82 @selected_categories = params[:selected_categories]
83 83 @selected_categories ||= []
84 84 @selected_categories = @selected_categories.map(&:to_i)
... ...
views/search/_catalog_filter.html.erb
  Diff comments   View file @669e022
... ... @@ -26,6 +26,7 @@
26 26 <%= _("#{category.name}") %>
27 27 </label> <br>
28 28 <% end %>
  29 + <br />
29 30 </div>
30 31 </div>
31 32  
... ...