Download as
Browse Code »

Commit 8c6e1dba6fbedae02ea0c5ce829cd2b39cdd0c05

Authored by Luciano Prestes
Committed by Álvaro Fernando Matos de Souza
1 parent 940273be
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

Refactor categories group on software catalog 

Signed-off-by: Arthur Jahn <stutrzbecher@gmail.com>
Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>
Showing 2 changed files with 1 additions and 15 deletions   Show diff stats
lib/ext/search_controller.rb
  Diff comments   View file @8c6e1db
@@ -140,14 +140,6 @@ class SearchController @@ -140,14 +140,6 @@ class SearchController
140 140
141 def prepare_software_infos_category_groups 141 def prepare_software_infos_category_groups
142 @categories = Category.software_categories.sort{|a, b| a.name <=> b.name} 142 @categories = Category.software_categories.sort{|a, b| a.name <=> b.name}
143 - @categories_groupe_one = []  
144 - @categories_groupe_two = []  
145 -  
146 - if @categories && @categories.count > 1  
147 - categories_sliced = @categories.each_slice(@categories.count/2)  
148 - @categories_groupe_one = categories_sliced.next  
149 - @categories_groupe_two = categories_sliced.next  
150 - end  
151 end 143 end
152 144
153 def prepare_software_infos_category_enable 145 def prepare_software_infos_category_enable
views/search/_catalog_filter.html.erb
  Diff comments   View file @8c6e1db
@@ -4,18 +4,12 @@ @@ -4,18 +4,12 @@
4 <div id="filter-categories-catalog"><h4> <%= _("Categories") %> </h4></div> 4 <div id="filter-categories-catalog"><h4> <%= _("Categories") %> </h4></div>
5 <div id="group-categories"> 5 <div id="group-categories">
6 <ul> 6 <ul>
7 - <% @categories_groupe_one.each do |category| %> 7 + <% @categories.each do |category| %>
8 <li> 8 <li>
9 <%= check_box_tag("selected_categories_id[]", category.id, @selected_categories_id.include?(category.id), :class => "categories-catalog", @enabled_check_box[category] => "true") %> 9 <%= check_box_tag("selected_categories_id[]", category.id, @selected_categories_id.include?(category.id), :class => "categories-catalog", @enabled_check_box[category] => "true") %>
10 <span><%= _("#{category.name}") %></span> 10 <span><%= _("#{category.name}") %></span>
11 </li> 11 </li>
12 <% end %> 12 <% end %>
13 - <% @categories_groupe_two.each do |category| %>  
14 - <li>  
15 - <%= check_box_tag("selected_categories_id[]", category.id, @selected_categories_id.include?(category.id), :class => "categories-catalog", @enabled_check_box[category] => "true") %>  
16 - <%= _("#{category.name}") %>  
17 - </li>  
18 - <% end %>  
19 </ul> 13 </ul>
20 </div> 14 </div>
21 15