diff --git a/app/controllers/artist_versions_controller.rb b/app/controllers/artist_versions_controller.rb index b4f42e1a0..914f9f79b 100644 --- a/app/controllers/artist_versions_controller.rb +++ b/app/controllers/artist_versions_controller.rb @@ -2,7 +2,7 @@ class ArtistVersionsController < ApplicationController respond_to :html, :xml, :json def index - @artist_versions = ArtistVersion.search(params[:search]).order("id desc").paginate(params[:page], :search_count => params[:search]) + @artist_versions = ArtistVersion.search(params[:search]).order("id desc").paginate(params[:page], :limit => params[:limit], :search_count => params[:search]) respond_with(@artist_versions) do |format| format.xml do render :xml => @artist_versions.to_xml(:root => "artist-versions") diff --git a/app/controllers/artists_controller.rb b/app/controllers/artists_controller.rb index f6fcc5e15..24269e01b 100644 --- a/app/controllers/artists_controller.rb +++ b/app/controllers/artists_controller.rb @@ -32,7 +32,7 @@ class ArtistsController < ApplicationController end def index - @artists = Artist.search(params[:search] || params).order("id desc").paginate(params[:page]) + @artists = Artist.search(params[:search] || params).order("id desc").paginate(params[:page], :limit => params[:limit]) respond_with(@artists) do |format| format.xml do render :xml => @artists.to_xml(:include => [:urls], :root => "artists") diff --git a/app/controllers/bans_controller.rb b/app/controllers/bans_controller.rb index d31787883..efd5419a1 100644 --- a/app/controllers/bans_controller.rb +++ b/app/controllers/bans_controller.rb @@ -11,7 +11,7 @@ class BansController < ApplicationController def index @search = Ban.search(params[:search]).order("id desc") - @bans = @search.paginate(params[:page]) + @bans = @search.paginate(params[:page], :limit => params[:limit]) end def show diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb index a46c85ae6..6f64a7e3c 100644 --- a/app/controllers/comments_controller.rb +++ b/app/controllers/comments_controller.rb @@ -83,7 +83,7 @@ private end def index_by_comment - @comments = Comment.search(params[:search]).order("comments.id DESC").paginate(params[:page], :search_count => params[:search]) + @comments = Comment.search(params[:search]).order("comments.id DESC").paginate(params[:page], :limit => params[:limit], :search_count => params[:search]) respond_with(@comments) do |format| format.html {render :action => "index_by_comment"} format.xml do diff --git a/app/controllers/delayed_jobs_controller.rb b/app/controllers/delayed_jobs_controller.rb index 90d6f03c3..5897ac68b 100644 --- a/app/controllers/delayed_jobs_controller.rb +++ b/app/controllers/delayed_jobs_controller.rb @@ -1,5 +1,5 @@ class DelayedJobsController < ApplicationController def index - @delayed_jobs = Delayed::Job.order("created_at desc").paginate(params[:page]) + @delayed_jobs = Delayed::Job.order("created_at desc").paginate(params[:page], :limit => params[:limit]) end end diff --git a/app/controllers/dmails_controller.rb b/app/controllers/dmails_controller.rb index 30759c3c5..19231a5af 100644 --- a/app/controllers/dmails_controller.rb +++ b/app/controllers/dmails_controller.rb @@ -16,7 +16,7 @@ class DmailsController < ApplicationController def index cookies[:dmail_folder] = params[:folder] @search = Dmail.visible.search(params[:search]) - @dmails = @search.order("dmails.created_at desc").paginate(params[:page]) + @dmails = @search.order("dmails.created_at desc").paginate(params[:page], :limit => params[:limit]) respond_with(@dmails) do |format| format.xml do render :xml => @dmails.to_xml(:root => "dmails") diff --git a/app/controllers/forum_posts_controller.rb b/app/controllers/forum_posts_controller.rb index a53a72a20..65e571ff4 100644 --- a/app/controllers/forum_posts_controller.rb +++ b/app/controllers/forum_posts_controller.rb @@ -21,7 +21,7 @@ class ForumPostsController < ApplicationController else @search = ForumPost.active.search(params[:search]) end - @forum_posts = @search.order("forum_posts.id DESC").paginate(params[:page], :search_count => params[:search]) + @forum_posts = @search.order("forum_posts.id DESC").paginate(params[:page], :limit => params[:limit], :search_count => params[:search]) respond_with(@forum_posts) do |format| format.xml do render :xml => @forum_posts.to_xml(:root => "forum-posts") diff --git a/app/controllers/forum_topics_controller.rb b/app/controllers/forum_topics_controller.rb index 956db790f..0ff5a0c4c 100644 --- a/app/controllers/forum_topics_controller.rb +++ b/app/controllers/forum_topics_controller.rb @@ -19,7 +19,7 @@ class ForumTopicsController < ApplicationController def index @search = ForumTopic.active.search(params[:search]) - @forum_topics = @search.order("is_sticky DESC, updated_at DESC").paginate(params[:page], :search_count => params[:search]) + @forum_topics = @search.order("is_sticky DESC, updated_at DESC").paginate(params[:page], :limit => params[:limit], :search_count => params[:search]) respond_with(@forum_topics) do |format| format.xml do render :xml => @forum_topics.to_xml(:root => "forum-topics") diff --git a/app/controllers/ip_bans_controller.rb b/app/controllers/ip_bans_controller.rb index 9873ee26f..e28b006c3 100644 --- a/app/controllers/ip_bans_controller.rb +++ b/app/controllers/ip_bans_controller.rb @@ -17,7 +17,7 @@ class IpBansController < ApplicationController def index @search = IpBan.search(params[:search]) - @ip_bans = @search.order("id desc").paginate(params[:page]) + @ip_bans = @search.order("id desc").paginate(params[:page], :limit => params[:limit]) end def destroy diff --git a/app/controllers/janitor_trials_controller.rb b/app/controllers/janitor_trials_controller.rb index d2f35e324..21fa74fd0 100644 --- a/app/controllers/janitor_trials_controller.rb +++ b/app/controllers/janitor_trials_controller.rb @@ -14,7 +14,7 @@ class JanitorTrialsController < ApplicationController def index @search = JanitorTrial.search(params[:search]) - @janitor_trials = @search.order("id desc").paginate(params[:page]) + @janitor_trials = @search.order("id desc").paginate(params[:page], :limit => params[:limit]) respond_with(@janitor_trials) end diff --git a/app/controllers/mod_actions_controller.rb b/app/controllers/mod_actions_controller.rb index 4197e2718..0533d7e34 100644 --- a/app/controllers/mod_actions_controller.rb +++ b/app/controllers/mod_actions_controller.rb @@ -1,5 +1,5 @@ class ModActionsController < ApplicationController def index - @mod_actions = ModAction.search(params[:search]).order("id desc").paginate(params[:page]) + @mod_actions = ModAction.search(params[:search]).order("id desc").paginate(params[:page], :limit => params[:limit]) end end diff --git a/app/controllers/news_updates_controller.rb b/app/controllers/news_updates_controller.rb index 784186b02..f9a85fb30 100644 --- a/app/controllers/news_updates_controller.rb +++ b/app/controllers/news_updates_controller.rb @@ -3,7 +3,7 @@ class NewsUpdatesController < ApplicationController respond_to :html def index - @news_updates = NewsUpdate.order("id desc").paginate(params[:page]) + @news_updates = NewsUpdate.order("id desc").paginate(params[:page], :limit => params[:limit]) respond_with(@news_updates) end diff --git a/app/controllers/note_versions_controller.rb b/app/controllers/note_versions_controller.rb index be3ef428f..cfc9c8414 100644 --- a/app/controllers/note_versions_controller.rb +++ b/app/controllers/note_versions_controller.rb @@ -3,7 +3,7 @@ class NoteVersionsController < ApplicationController before_filter :member_only, :except => [:index, :show] def index - @note_versions = NoteVersion.search(params[:search]).order("note_versions.id desc").paginate(params[:page]) + @note_versions = NoteVersion.search(params[:search]).order("note_versions.id desc").paginate(params[:page], :limit => params[:limit]) respond_with(@note_versions) do |format| format.xml do render :xml => @note_versions.to_xml(:root => "note-versions") diff --git a/app/controllers/pool_versions_controller.rb b/app/controllers/pool_versions_controller.rb index 332d90edf..e89296fdc 100644 --- a/app/controllers/pool_versions_controller.rb +++ b/app/controllers/pool_versions_controller.rb @@ -6,7 +6,7 @@ class PoolVersionsController < ApplicationController @pool = Pool.find(params[:search][:pool_id]) end - @pool_versions = PoolVersion.search(params[:search]).order("updated_at desc").paginate(params[:page], :search_count => params[:search]) + @pool_versions = PoolVersion.search(params[:search]).order("updated_at desc").paginate(params[:page], :limit => params[:limit], :search_count => params[:search]) respond_with(@pool_versions) do |format| format.xml do render :xml => @pool_versions.to_xml(:root => "pool-versions") diff --git a/app/controllers/pools_controller.rb b/app/controllers/pools_controller.rb index 7c3aeb6e5..2fbc70ca9 100644 --- a/app/controllers/pools_controller.rb +++ b/app/controllers/pools_controller.rb @@ -15,7 +15,7 @@ class PoolsController < ApplicationController end def index - @pools = Pool.active.search(params[:search]).order("updated_at desc").paginate(params[:page], :search_count => params[:search]) + @pools = Pool.active.search(params[:search]).order("updated_at desc").paginate(params[:page], :limit => params[:limit], :search_count => params[:search]) respond_with(@pools) do |format| format.xml do render :xml => @pools.to_xml(:root => "pools") diff --git a/app/controllers/post_appeals_controller.rb b/app/controllers/post_appeals_controller.rb index ddf1fc646..7ed567cf3 100644 --- a/app/controllers/post_appeals_controller.rb +++ b/app/controllers/post_appeals_controller.rb @@ -10,7 +10,7 @@ class PostAppealsController < ApplicationController def index @search = PostAppeal.order("id desc").search(params[:search]) - @post_appeals = @search.paginate(params[:page]) + @post_appeals = @search.paginate(params[:page], :limit => params[:limit]) respond_with(@post_appeals) do |format| format.xml do render :xml => @post_appeals.to_xml(:root => "post-appeals") diff --git a/app/controllers/post_flags_controller.rb b/app/controllers/post_flags_controller.rb index b7738bc74..709212a12 100644 --- a/app/controllers/post_flags_controller.rb +++ b/app/controllers/post_flags_controller.rb @@ -10,7 +10,7 @@ class PostFlagsController < ApplicationController def index @search = PostFlag.order("id desc").search(params[:search]) - @post_flags = @search.paginate(params[:page]) + @post_flags = @search.paginate(params[:page], :limit => params[:limit]) respond_with(@post_flags) do |format| format.xml do render :xml => @post_flags.to_xml(:root => "post-flags") diff --git a/app/controllers/post_versions_controller.rb b/app/controllers/post_versions_controller.rb index e87cd1b04..89a606214 100644 --- a/app/controllers/post_versions_controller.rb +++ b/app/controllers/post_versions_controller.rb @@ -3,7 +3,7 @@ class PostVersionsController < ApplicationController rescue_from ActiveRecord::StatementInvalid, :with => :rescue_exception def index - @post_versions = PostVersion.search(params[:search]).order("updated_at desc").paginate(params[:page], :search_count => params[:search]) + @post_versions = PostVersion.search(params[:search]).order("updated_at desc").paginate(params[:page], :limit => params[:limit], :search_count => params[:search]) respond_with(@post_versions) do |format| format.xml do render :xml => @post_versions.to_xml(:root => "post-versions") diff --git a/app/controllers/tag_aliases_controller.rb b/app/controllers/tag_aliases_controller.rb index 7f66b7d88..735f41ead 100644 --- a/app/controllers/tag_aliases_controller.rb +++ b/app/controllers/tag_aliases_controller.rb @@ -17,7 +17,7 @@ class TagAliasesController < ApplicationController def index @search = TagAlias.search(params[:search]) - @tag_aliases = @search.order("(case status when 'pending' then 0 when 'queued' then 1 else 2 end), antecedent_name, consequent_name").paginate(params[:page]) + @tag_aliases = @search.order("(case status when 'pending' then 0 when 'queued' then 1 else 2 end), antecedent_name, consequent_name").paginate(params[:page], :limit => params[:limit]) respond_with(@tag_aliases) do |format| format.xml do render :xml => @tag_aliases.to_xml(:root => "tag-aliases") diff --git a/app/controllers/tag_implications_controller.rb b/app/controllers/tag_implications_controller.rb index d60d9d7b7..49079634a 100644 --- a/app/controllers/tag_implications_controller.rb +++ b/app/controllers/tag_implications_controller.rb @@ -9,7 +9,7 @@ class TagImplicationsController < ApplicationController def index @search = TagImplication.search(params[:search]) - @tag_implications = @search.order("(case status when 'pending' then 0 when 'queued' then 1 else 2 end), antecedent_name, consequent_name").paginate(params[:page]) + @tag_implications = @search.order("(case status when 'pending' then 0 when 'queued' then 1 else 2 end), antecedent_name, consequent_name").paginate(params[:page], :limit => params[:limit]) respond_with(@tag_implications) do |format| format.xml do render :xml => @tag_implications.to_xml(:root => "tag-implications") diff --git a/app/controllers/tag_subscriptions_controller.rb b/app/controllers/tag_subscriptions_controller.rb index b1023451f..2eaa73e06 100644 --- a/app/controllers/tag_subscriptions_controller.rb +++ b/app/controllers/tag_subscriptions_controller.rb @@ -17,7 +17,7 @@ class TagSubscriptionsController < ApplicationController def index @user = CurrentUser.user @search = TagSubscription.owned_by(@user).order("name").search(params[:search]) - @tag_subscriptions = @search.paginate(params[:page]) + @tag_subscriptions = @search.paginate(params[:page], :limit => params[:limit]) respond_with(@tag_subscriptions) end diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb index 32f0bbaed..3a5c50838 100644 --- a/app/controllers/tags_controller.rb +++ b/app/controllers/tags_controller.rb @@ -9,7 +9,7 @@ class TagsController < ApplicationController end def index - @tags = Tag.search(params[:search]).paginate(params[:page], :search_count => params[:search]) + @tags = Tag.search(params[:search]).paginate(params[:page], :limit => params[:limit], :search_count => params[:search]) respond_with(@tags) do |format| format.xml do render :xml => @tags.to_xml(:root => "tags") diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb index 0b4f5ac3e..6f9716922 100644 --- a/app/controllers/uploads_controller.rb +++ b/app/controllers/uploads_controller.rb @@ -18,7 +18,7 @@ class UploadsController < ApplicationController def index @search = Upload.search(params[:search]) - @uploads = @search.order("id desc").paginate(params[:page]) + @uploads = @search.order("id desc").paginate(params[:page], :limit => params[:limit]) respond_with(@uploads) do |format| format.xml do render :xml => @uploads.to_xml(:root => "uploads") diff --git a/app/controllers/user_feedbacks_controller.rb b/app/controllers/user_feedbacks_controller.rb index e08ab3e03..4283faf7d 100644 --- a/app/controllers/user_feedbacks_controller.rb +++ b/app/controllers/user_feedbacks_controller.rb @@ -21,7 +21,7 @@ class UserFeedbacksController < ApplicationController def index @search = UserFeedback.search(params[:search]) - @user_feedbacks = @search.paginate(params[:page]).order("created_at desc") + @user_feedbacks = @search.paginate(params[:page], :limit => params[:limit]).order("created_at desc") respond_with(@user_feedbacks) do |format| format.xml do render :xml => @user_feedbacks.to_xml(:root => "user-feedbacks") diff --git a/app/controllers/user_name_change_requests_controller.rb b/app/controllers/user_name_change_requests_controller.rb index 4563f3000..2d9ff126a 100644 --- a/app/controllers/user_name_change_requests_controller.rb +++ b/app/controllers/user_name_change_requests_controller.rb @@ -28,7 +28,7 @@ class UserNameChangeRequestsController < ApplicationController end def index - @change_requests = UserNameChangeRequest.order("id desc").paginate(params[:page]) + @change_requests = UserNameChangeRequest.order("id desc").paginate(params[:page], :limit => params[:limit]) end def approve diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 31219a2a6..4bc03021b 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -19,7 +19,7 @@ class UsersController < ApplicationController @user = User.find_by_name(params[:name]) redirect_to user_path(@user) else - @users = User.search(params[:search]).order("users.id desc").paginate(params[:page], :search_count => params[:search]) + @users = User.search(params[:search]).order("users.id desc").paginate(params[:page], :limit => params[:limit], :search_count => params[:search]) respond_with(@users) do |format| format.xml do render :xml => @users.to_xml(:root => "users") diff --git a/app/controllers/wiki_page_versions_controller.rb b/app/controllers/wiki_page_versions_controller.rb index 685be53a1..b5fb6221a 100644 --- a/app/controllers/wiki_page_versions_controller.rb +++ b/app/controllers/wiki_page_versions_controller.rb @@ -2,7 +2,7 @@ class WikiPageVersionsController < ApplicationController respond_to :html, :xml, :json def index - @wiki_page_versions = WikiPageVersion.search(params[:search]).order("id desc").paginate(params[:page], :search_count => params[:search]) + @wiki_page_versions = WikiPageVersion.search(params[:search]).order("id desc").paginate(params[:page], :limit => params[:limit], :search_count => params[:search]) respond_with(@wiki_page_versions) do |format| format.xml do render :xml => @wiki_page_versions.to_xml(:root => "wiki-page-versions") diff --git a/app/controllers/wiki_pages_controller.rb b/app/controllers/wiki_pages_controller.rb index a3ca8ee28..153b5f8ad 100644 --- a/app/controllers/wiki_pages_controller.rb +++ b/app/controllers/wiki_pages_controller.rb @@ -17,7 +17,7 @@ class WikiPagesController < ApplicationController end def index - @wiki_pages = WikiPage.search(params[:search]).order("updated_at desc").paginate(params[:page], :search_count => params[:search]) + @wiki_pages = WikiPage.search(params[:search]).order("updated_at desc").paginate(params[:page], :limit => params[:limit], :search_count => params[:search]) respond_with(@wiki_pages) do |format| format.html do if @wiki_pages.count == 1 && (params[:page].nil? || params[:page].to_i == 1)