Download as
Browse Code »

Commit 526c04a9974824577ce636c52f7f890848488331

Authored by Aurélio A. Heckert
1 parent f9a7c1f7
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

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 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 17 else
18 18 content_tag('em', _('(empty folder)'))
19 19 end
... ...
app/views/shared/articles_list.rhtml
View file @f9a7c1f
... ... @@ -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 @@
  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 102 expects(:list_type).returns(:folder).at_least_once
103 103 expects(:recursive).returns(false).at_least_once
104 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 107 :locals => { :contents => contents, :recursive => false, :list_type => :folder }
108 108 ).returns(list)
109 109  
... ...