Merge Request #12

← To merge requests From order_categories_383 into master
Merged
softwarepublico/mpog_software!12
Created by Luciano Prestes

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

Assignee: Thiago Ribeiro
Milestone: None

Merged by Thiago Ribeiro

Source branch has been removed
Commits (1)
3 participants
Showing 2 changed files   Show diff stats
lib/categories_software_block.rb
  Diff comments   Edit   View file @bcc456c
... ... @@ -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   Edit   View file @bcc456c
... ... @@ -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>
... ...