Download as
Browse Code »

Commit 526c04a9974824577ce636c52f7f890848488331

Authored by Aurélio A. Heckert
1 parent f9a7c1f7
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

Rename articles_list.rhtml to content_list.rhtml 

`content_list` is a more coherent name for listing things that are no exactily an article.

Completes ActionItem3158 changes
Showing 4 changed files with 16 additions and 16 deletions   Show diff stats
app/helpers/folder_helper.rb
  Diff comments   View file @526c04a
@@ -13,7 +13,7 @@ module FolderHelper @@ -13,7 +13,7 @@ module FolderHelper
13 :page => params[:npage] 13 :page => params[:npage]
14 ) 14 )
15 15
16 - render :file => 'shared/articles_list', :locals => configure 16 + render :file => 'shared/content_list', :locals => configure
17 else 17 else
18 content_tag('em', _('(empty folder)')) 18 content_tag('em', _('(empty folder)'))
19 end 19 end
app/views/shared/articles_list.rhtml
View file @f9a7c1f
@@ -1,13 +0,0 @@ @@ -1,13 +0,0 @@
1 -<table class="<%= list_type %>-content">  
2 - <tr>  
3 - <th><%= _('Title') %></th>  
4 - <th><%= _('Last update') %></th>  
5 - </tr>  
6 - <% contents.each do |content| %>  
7 - <% if content.display_to?(user) %>  
8 - <%= display_content_in_listing :content=>content, :list_type=>list_type, :recursive=>recursive %>  
9 - <% end %>  
10 - <% end %>  
11 -</table>  
12 -  
13 -<p><%= pagination_links contents, :param_name => 'npage', :page_links => true %></p>  
app/views/shared/content_list.rhtml 0 → 100644
  Diff comments   View file @526c04a
@@ -0,0 +1,13 @@ @@ -0,0 +1,13 @@
  1 +<table class="<%= list_type %>-content">
  2 + <tr>
  3 + <th><%= _('Title') %></th>
  4 + <th><%= _('Last update') %></th>
  5 + </tr>
  6 + <% contents.each do |content| %>
  7 + <% if content.display_to?(user) %>
  8 + <%= display_content_in_listing :content=>content, :list_type=>list_type, :recursive=>recursive %>
  9 + <% end %>
  10 + <% end %>
  11 +</table>
  12 +
  13 +<p><%= pagination_links contents, :param_name => 'npage', :page_links => true %></p>
test/unit/folder_helper_test.rb
  Diff comments   View file @526c04a
@@ -102,8 +102,8 @@ class FolderHelperTest &lt; ActiveSupport::TestCase @@ -102,8 +102,8 @@ class FolderHelperTest &lt; ActiveSupport::TestCase
102 expects(:list_type).returns(:folder).at_least_once 102 expects(:list_type).returns(:folder).at_least_once
103 expects(:recursive).returns(false).at_least_once 103 expects(:recursive).returns(false).at_least_once
104 expects(:pagination_links).with(anything, anything).returns('') 104 expects(:pagination_links).with(anything, anything).returns('')
105 - list = render 'shared/articles_list', binding  
106 - expects(:render).with(:file => 'shared/articles_list', 105 + list = render 'shared/content_list', binding
  106 + expects(:render).with(:file => 'shared/content_list',
107 :locals => { :contents => contents, :recursive => false, :list_type => :folder } 107 :locals => { :contents => contents, :recursive => false, :list_type => :folder }
108 ).returns(list) 108 ).returns(list)
109 109