jeena/refinerycms-blog
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

will_paginate is back.

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/refinery/admin/blog/posts_controller.rb
View file

@ -1,3 +1,5 @@
require 'will_paginate/array'
module Refinery module Refinery
module Admin module Admin
module Blog module Blog
@ -9,7 +11,8 @@ module Refinery
:order => 'published_at DESC' :order => 'published_at DESC'
def uncategorized 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 end
def tags def tags

2
app/models/refinery/blog_category.rb
View file

@ -18,7 +18,7 @@ module Refinery
end end
# how many items to show per page # 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
end end

2
app/models/refinery/blog_post.rb
View file

@ -96,7 +96,7 @@ module Refinery
# how many items to show per page # how many items to show per page
def 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
end end

4
app/views/refinery/admin/blog/categories/index.html.erb
View file

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

8
app/views/refinery/admin/blog/comments/index.html.erb
View file

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

4
app/views/refinery/admin/blog/posts/index.html.erb
View file

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

4
app/views/refinery/admin/blog/posts/uncategorized.html.erb
View file

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

2
app/views/refinery/blog/categories/show.html.erb
View file

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

2
app/views/refinery/blog/posts/index.html.erb
View file

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

2
app/views/refinery/blog/posts/tagged.html.erb
View file

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