diff options
| author | Matt Jankowski <mjankowski@thoughtbot.com> | 2017-04-10 19:11:41 -0400 |
|---|---|---|
| committer | Eugen <eugen@zeonfederated.com> | 2017-04-11 01:11:41 +0200 |
| commit | 4ada50985a73ed5c859cdf5160500b04116ad0e4 (patch) | |
| tree | 6e51b5cf970bc4f945834e65bf8bd37b1ef8fb5f /app/controllers/admin | |
| parent | a28378646393de998663981e6660eb79e7a6375f (diff) | |
Pagination improvements (#1445)
* Replace will_paginate with kaminari * Use #page instead of #paginate in controllers * Replace will_paginate.page_gap with pagination.truncate in i18n * Customize kaminari views to match prior styles * Set kaminari options to match prior behavior * Replace will_paginate with paginate in views
Diffstat (limited to 'app/controllers/admin')
| -rw-r--r-- | app/controllers/admin/accounts_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/admin/domain_blocks_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/admin/pubsubhubbub_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/admin/reports_controller.rb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/admin/accounts_controller.rb b/app/controllers/admin/accounts_controller.rb index 60b631ece..71cb8edd8 100644 --- a/app/controllers/admin/accounts_controller.rb +++ b/app/controllers/admin/accounts_controller.rb @@ -5,7 +5,7 @@ module Admin before_action :set_account, except: :index def index - @accounts = Account.alphabetic.paginate(page: params[:page], per_page: 40) + @accounts = Account.alphabetic.page(params[:page]) @accounts = @accounts.local if params[:local].present? @accounts = @accounts.remote if params[:remote].present? diff --git a/app/controllers/admin/domain_blocks_controller.rb b/app/controllers/admin/domain_blocks_controller.rb index 58f1efa5b..a8b56c085 100644 --- a/app/controllers/admin/domain_blocks_controller.rb +++ b/app/controllers/admin/domain_blocks_controller.rb @@ -3,7 +3,7 @@ module Admin class DomainBlocksController < BaseController def index - @blocks = DomainBlock.paginate(page: params[:page], per_page: 40) + @blocks = DomainBlock.page(params[:page]) end def new diff --git a/app/controllers/admin/pubsubhubbub_controller.rb b/app/controllers/admin/pubsubhubbub_controller.rb index 95f79c520..31c80a174 100644 --- a/app/controllers/admin/pubsubhubbub_controller.rb +++ b/app/controllers/admin/pubsubhubbub_controller.rb @@ -3,7 +3,7 @@ module Admin class PubsubhubbubController < BaseController def index - @subscriptions = Subscription.order('id desc').includes(:account).paginate(page: params[:page], per_page: 40) + @subscriptions = Subscription.order('id desc').includes(:account).page(params[:page]) end end end diff --git a/app/controllers/admin/reports_controller.rb b/app/controllers/admin/reports_controller.rb index 5a37d8e6e..3c3082318 100644 --- a/app/controllers/admin/reports_controller.rb +++ b/app/controllers/admin/reports_controller.rb @@ -5,7 +5,7 @@ module Admin before_action :set_report, except: [:index] def index - @reports = Report.includes(:account, :target_account).order('id desc').paginate(page: params[:page], per_page: 40) + @reports = Report.includes(:account, :target_account).order('id desc').page(params[:page]) @reports = params[:action_taken].present? ? @reports.resolved : @reports.unresolved end |