From 526c04a9974824577ce636c52f7f890848488331 Mon Sep 17 00:00:00 2001 From: Aurélio A. Heckert Date: Wed, 4 Jun 2014 18:48:39 -0300 Subject: [PATCH] Rename articles_list.rhtml to content_list.rhtml --- app/helpers/folder_helper.rb | 2 +- app/views/shared/articles_list.rhtml | 13 ------------- app/views/shared/content_list.rhtml | 13 +++++++++++++ test/unit/folder_helper_test.rb | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 app/views/shared/articles_list.rhtml create mode 100644 app/views/shared/content_list.rhtml diff --git a/app/helpers/folder_helper.rb b/app/helpers/folder_helper.rb index 71119a0..ad487b8 100644 --- a/app/helpers/folder_helper.rb +++ b/app/helpers/folder_helper.rb @@ -13,7 +13,7 @@ module FolderHelper :page => params[:npage] ) - render :file => 'shared/articles_list', :locals => configure + render :file => 'shared/content_list', :locals => configure else content_tag('em', _('(empty folder)')) end diff --git a/app/views/shared/articles_list.rhtml b/app/views/shared/articles_list.rhtml deleted file mode 100644 index 3abfbe3..0000000 --- a/app/views/shared/articles_list.rhtml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - <% contents.each do |content| %> - <% if content.display_to?(user) %> - <%= display_content_in_listing :content=>content, :list_type=>list_type, :recursive=>recursive %> - <% end %> - <% end %> -
<%= _('Title') %><%= _('Last update') %>
- -

<%= pagination_links contents, :param_name => 'npage', :page_links => true %>

diff --git a/app/views/shared/content_list.rhtml b/app/views/shared/content_list.rhtml new file mode 100644 index 0000000..3abfbe3 --- /dev/null +++ b/app/views/shared/content_list.rhtml @@ -0,0 +1,13 @@ + + + + + + <% contents.each do |content| %> + <% if content.display_to?(user) %> + <%= display_content_in_listing :content=>content, :list_type=>list_type, :recursive=>recursive %> + <% end %> + <% end %> +
<%= _('Title') %><%= _('Last update') %>
+ +

<%= pagination_links contents, :param_name => 'npage', :page_links => true %>

diff --git a/test/unit/folder_helper_test.rb b/test/unit/folder_helper_test.rb index 715fec6..d951e11 100644 --- a/test/unit/folder_helper_test.rb +++ b/test/unit/folder_helper_test.rb @@ -102,8 +102,8 @@ class FolderHelperTest < ActiveSupport::TestCase expects(:list_type).returns(:folder).at_least_once expects(:recursive).returns(false).at_least_once expects(:pagination_links).with(anything, anything).returns('') - list = render 'shared/articles_list', binding - expects(:render).with(:file => 'shared/articles_list', + list = render 'shared/content_list', binding + expects(:render).with(:file => 'shared/content_list', :locals => { :contents => contents, :recursive => false, :list_type => :folder } ).returns(list) -- libgit2 0.21.2