will_paginate is back.

This commit is contained in:
Uģis Ozols 2011-08-25 13:57:59 +03:00
parent 6b73469c1a
commit 36affef45e
10 changed files with 19 additions and 16 deletions

View file

@ -1,3 +1,5 @@
require 'will_paginate/array'
module Refinery
module Admin
module Blog
@ -9,7 +11,8 @@ module Refinery
:order => 'published_at DESC'
def uncategorized
@blog_posts = Kaminari.paginate_array(Refinery::BlogPost.uncategorized).page(params[:page]).per(Refinery::BlogPost.per_page)
@blog_posts = Refinery::BlogPost.uncategorized.paginate(:page => params[:page],
:per_page => Refinery::BlogPost.per_page)
end
def tags

View file

@ -18,7 +18,7 @@ module Refinery
end
# how many items to show per page
paginates_per Refinery::Setting.find_or_set(:blog_posts_per_page, 10)
self.per_page = Refinery::Setting.find_or_set(:blog_posts_per_page, 10)
end
end

View file

@ -96,7 +96,7 @@ module Refinery
# how many items to show per page
def per_page
paginates_per Refinery::Setting.find_or_set(:blog_posts_per_page, 10)
Refinery::Setting.find_or_set(:blog_posts_per_page, 10)
end
end

View file

@ -11,11 +11,11 @@
<% end %>
<% else %>
<% if @blog_categories.any? %>
<%= paginate @blog_categories %>
<%= will_paginate @blog_categories %>
<%= render :partial => "sortable_list" %>
<%= paginate @blog_categories %>
<%= will_paginate @blog_categories %>
<% else %>
<p>
<strong>

View file

@ -3,24 +3,24 @@
<% if searching? %>
<h2><%= t('results_for', :scope => 'shared.admin.search', :query => params[:search]) %></h2>
<% if @blog_comments.any? %>
<%=# paginate @blog_comments %>
<%=# will_paginate @blog_comments %>
<ul>
<%= render :partial => "blog_comments",
:collection => @blog_comments %>
</ul>
<%=# paginate @blog_comments %>
<%=# will_paginate @blog_comments %>
<% else %>
<p><%= t('search_no_results', :scope => 'admin') %></p>
<% end %>
<% else %>
<% if @blog_comments.any? %>
<%=# paginate @blog_comments %>
<%=# will_paginate @blog_comments %>
<%= render :partial => "sortable_list" %>
<%=# paginate @blog_comments %>
<%=# will_paginate @blog_comments %>
<% else %>
<h3>
<%= t('.no_items_yet',

View file

@ -12,11 +12,11 @@
<% end %>
<% else %>
<% if @blog_posts.any? %>
<%= paginate @blog_posts %>
<%= will_paginate @blog_posts %>
<%= render :partial => "sortable_list" %>
<%= paginate @blog_posts %>
<%= will_paginate @blog_posts %>
<% else %>
<p>
<strong>

View file

@ -11,11 +11,11 @@
<% end %>
<% else %>
<% if @blog_posts.any? %>
<%= paginate @blog_posts %>
<%= will_paginate @blog_posts %>
<%= render :partial => "sortable_list" %>
<%= paginate @blog_posts %>
<%= will_paginate @blog_posts %>
<% else %>
<p>
<strong>

View file

@ -4,7 +4,7 @@
<% if @blog_posts.any? %>
<section id="blog_posts">
<%= render :partial => "/refinery/blog/shared/post", :collection => @blog_posts %>
<%= paginate @blog_posts %>
<%= will_paginate @blog_posts %>
</section>
<% else %>
<p>

View file

@ -4,7 +4,7 @@
<% if @blog_posts.any? %>
<section id="blog_posts">
<%= render :partial => "/refinery/blog/shared/post", :collection => @blog_posts %>
<%= paginate @blog_posts %>
<%= will_paginate @blog_posts %>
</section>
<% else %>
<p><%= t('.no_blog_articles_yet') %></p>

View file

@ -4,7 +4,7 @@
<% if @blog_posts.any? %>
<section id="blog_posts">
<%= render :partial => "/refinery/blog/shared/post", :collection => @blog_posts %>
<%= paginate @blog_posts %>
<%= will_paginate @blog_posts %>
</section>
<% else %>
<p><%= t('.no_blog_articles_yet') %></p>