Download as
Browse Code »

Commit a7f039c706c85a11ca0990b4912c27f0585911f9

Authored by Antonio Terceiro
2 parents 27d346ba 049d7ae3
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Merge branch 'empty-folder-view' into 'master' 

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

See merge request !637
Showing 1 changed file with 2 additions and 5 deletions   Show diff stats
app/views/content_viewer/folder.html.erb
  Diff comments   View file @a7f039c
... ... @@ -4,8 +4,5 @@
4 4 </div>
5 5 <% end %>
6 6  
7   -<% if folder.children.empty? %>
8   - <em><%= _('(empty folder)') %></em>
9   -<% else %>
10   - <%= list_contents(:contents=>folder.children) %>
11   -<% end %>
  7 +<%= list_contents contents: folder.children %>
  8 +
... ...