Download as
Browse Code »

Commit a7f039c706c85a11ca0990b4912c27f0585911f9

Authored by Antonio Terceiro
2 parents 27d346ba 049d7ae3
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

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,8 +4,5 @@
4 </div> 4 </div>
5 <% end %> 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 +