[Git][noosfero/noosfero][master] 2 commits: folder: fix empty subfolder view

[Antonio Terceiro]

Antonio Terceiro pushed to branch master at Noosfero / noosfero


Commits:
049d7ae3 by Braulio Bhavamitra at 2015-07-28T13:39:23Z
folder: fix empty subfolder view

It seems #empty? is emptying #children (probably a rails bug)

- - - - -
a7f039c7 by Antonio Terceiro at 2015-08-04T19:20:13Z
Merge branch 'empty-folder-view' into 'master'

folder: #empty? is emptying #children (probably a rails bug)

See merge request !637

- - - - -


1 changed file:

- app/views/content_viewer/folder.html.erb


Changes:

=====================================
app/views/content_viewer/folder.html.erb
=====================================
--- a/app/views/content_viewer/folder.html.erb
+++ b/app/views/content_viewer/folder.html.erb
@@ -4,8 +4,5 @@
   </div>
 <% end %>
 
-<% if folder.children.empty? %>
-  <em><%= _('(empty folder)') %></em>
-<% else %>
-  <%= list_contents(:contents=>folder.children) %>
-<% end %>
+<%= list_contents contents: folder.children %>
+



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/27d346bad4e1d3eddabf398ddb9c23e84cfe7357...a7f039c706c85a11ca0990b4912c27f0585911f9
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20150804/bf930cd1/attachment.html>