diff --git a/app/controllers/admin/articles_controller.rb b/app/controllers/admin/articles_controller.rb index 7cdd207..00c85eb 100644 --- a/app/controllers/admin/articles_controller.rb +++ b/app/controllers/admin/articles_controller.rb @@ -104,11 +104,10 @@ class Admin::ArticlesController < ApplicationController @articles = Article.order('published_at DESC') @articles = @articles.after(start) if start @articles = @articles.before(stop) if stop - per_page = (params[:per_page] and params[:per_page] != "") ? params[:per_page] : 5000 + per_page = (params[:per_page] and params[:per_page] != "") ? params[:per_page] : 30 page = (params[:page] and params[:page] != "") ? params[:page] : 1 @articles = @articles.page(page).per(per_page) - #@articles = Event.order('start_at, stop_at').after(start).before(stop) end private