Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Fix order of paginated accounts in FollowerDomainsController and spec (#3357)

Browse source 
* Fix order of paginated accounts in FollowerDomainsController

Unordered pagination could result in unexpected behavior.

* Cover Settings::FollowerDomainsController more
This commit is contained in:
Akihiko Odaki 2017-10-01 06:06:09 +09:00 • committed by Eugen Rochko
parent eb605141ff
commit cdacac8c6c
2 changed files with 59 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/settings/follower_domains_controller.rb
View file

@ -9,7 +9,7 @@ class Settings::FollowerDomainsController < ApplicationController
def show
@account = current_account
@domains = current_account.followers.reorder(nil).group('accounts.domain').select('accounts.domain, count(accounts.id) as accounts_from_domain').page(params[:page]).per(10)
@domains = current_account.followers.reorder('MIN(follows.id) DESC').group('accounts.domain').select('accounts.domain, count(accounts.id) as accounts_from_domain').page(params[:page]).per(10)
end
def update