Download as
Browse Code »

Commit ea527e8a7f2df9105cae1050aace77f1b735da24

Authored by Luciano Prestes Cavalcanti
Committed by Luciano Prestes
1 parent a4819142
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

Disable categories without software in software catalog 

Signed_off_by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
Showing 2 changed files with 16 additions and 2 deletions   Show diff stats
lib/ext/search_controller.rb
  Diff comments   View file @ea527e8
@@ -110,6 +110,7 @@ class SearchController @@ -110,6 +110,7 @@ class SearchController
110 prepare_software_infos_params 110 prepare_software_infos_params
111 prepare_software_infos_message 111 prepare_software_infos_message
112 prepare_software_infos_category_groups 112 prepare_software_infos_category_groups
  113 + prepare_software_infos_category_enable
113 end 114 end
114 115
115 def prepare_software_infos_params 116 def prepare_software_infos_params
@@ -155,4 +156,17 @@ class SearchController @@ -155,4 +156,17 @@ class SearchController
155 end 156 end
156 end 157 end
157 158
  159 + def prepare_software_infos_category_enable
  160 + @enabled_check_box = Hash.new
  161 + categories = Category.software_categories
  162 +
  163 + categories.each do |category|
  164 + if category.software_infos.count > 0
  165 + @enabled_check_box[category] = :enabled
  166 + else
  167 + @enabled_check_box[category] = :disabled
  168 + end
  169 + end
  170 + end
  171 +
158 end 172 end
views/search/_catalog_filter.html.erb
  Diff comments   View file @ea527e8
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 <div id="gruop-catalog-01"> 14 <div id="gruop-catalog-01">
15 <% @categories_groupe_one.each do |category| %> 15 <% @categories_groupe_one.each do |category| %>
16 <label> 16 <label>
17 - <%= check_box_tag("selected_categories[]", category.id, @selected_categories.include?(category.id), :class => "categories-catalog") %> 17 + <%= check_box_tag("selected_categories[]", category.id, @selected_categories.include?(category.id), :class => "categories-catalog", @enabled_check_box[category] => "true") %>
18 <span><%= _("#{category.name}") %></span> 18 <span><%= _("#{category.name}") %></span>
19 </label> <br> 19 </label> <br>
20 <% end %> 20 <% end %>
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
22 <div id="group-catalog-02"> 22 <div id="group-catalog-02">
23 <% @categories_groupe_two.each do |category| %> 23 <% @categories_groupe_two.each do |category| %>
24 <label> 24 <label>
25 - <%= check_box_tag("selected_categories[]", category.id, @selected_categories.include?(category.id), :class => "categories-catalog") %> 25 + <%= check_box_tag("selected_categories[]", category.id, @selected_categories.include?(category.id), :class => "categories-catalog", @enabled_check_box[category] => "true") %>
26 <%= _("#{category.name}") %> 26 <%= _("#{category.name}") %>
27 </label> <br> 27 </label> <br>
28 <% end %> 28 <% end %>