Download as
Browse Code »

Commit 7ed2d55d2e369daaab7f3aca554b91d7aa9e2488

Authored by Thiago Ribeiro
2 parents 61040de7 bcc456c3
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

Merge branch 'order_categories_383' into 'master' 

Ordenar categorias de catalogo de software

Issue no repositório softwarepublico/noosfero:
https://softwarepublico.gov.br/gitlab/softwarepublico/noosfero/issues/383

Issue no repositório softwarepublico/softwarepublico:
https://softwarepublico.gov.br/gitlab/softwarepublico/softwarepublico/issues/251

See merge request !12
Showing 2 changed files with 9 additions and 7 deletions   Show diff stats
lib/categories_software_block.rb
  Diff comments   View file @7ed2d55
... ... @@ -16,10 +16,15 @@ class CategoriesSoftwareBlock < Block
16 16 def content(args={})
17 17 block = self
18 18 s = show_name
  19 +
  20 + software_category = Category.find_by_name("Software")
  21 + categories = []
  22 + categories = software_category.children.sort if software_category
  23 +
19 24 lambda do |object|
20 25 render(
21 26 :file => 'blocks/categories_software',
22   - :locals => { :block => block, :show_name => s }
  27 + :locals => { :block => block, :show_name => s, :categories => categories }
23 28 )
24 29 end
25 30 end
... ...
views/blocks/categories_software.html.erb
  Diff comments   View file @7ed2d55
... ... @@ -8,12 +8,9 @@
8 8 <p><%= _("Categories:") %></p>
9 9 <ul class="categories-mais-software">
10 10  
11   - <% categories = Category.where(:name => "Software") %>
12   - <% unless categories.blank? %>
13   - <% categories.first.children.each do |category| %>
14   - <% unless category.software_infos.count < 1 %>
15   - <li><%= link_to _("#{category.name}") + " (#{category.software_infos.count})", {:controller => :search, :action => :software_infos, :selected_categories_id => [category.id]} %></li>
16   - <% end %>
  11 + <% categories.each do |category| %>
  12 + <% unless category.software_infos.count < 1 %>
  13 + <li><%= link_to _("#{category.name}") + " (#{category.software_infos.count})", {:controller => :search, :action => :software_infos, :selected_categories_id => [category.id]} %></li>
17 14 <% end %>
18 15 <% end %>
19 16 </ul>
... ...