techhub/mastodon
2
0
Fork 0
Code Activity

Pagination improvements (#1445)

Browse Source 
* 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
This commit is contained in:
Matt Jankowski
2017-04-10 19:11:41 -04:00
committed by Eugen
parent a283786463
commit 4ada50985a
36 changed files with 77 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/accounts_controller.rb
View File

@@ -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?