Fix pagination/sorting for disputed domains

This commit is contained in:
Karl Erik Õunapuu 2020-05-19 12:25:04 +03:00
parent cb0051d4e0
commit 0998ada2fc
2 changed files with 10 additions and 10 deletions

View file

@ -9,7 +9,7 @@ module Admin
def index
params[:q] ||= {}
@disputes = sortable_dispute_query_for(Dispute.active.all, params[:q])
@closed_disputes = sortable_dispute_query_for(Dispute.closed.all, params[:q])
@closed_disputes = sortable_dispute_query_for(Dispute.closed.all, params[:q], closed: true)
end
# GET /admin/disputes/1
@ -53,9 +53,9 @@ module Admin
private
def sortable_dispute_query_for(disputes, query)
def sortable_dispute_query_for(disputes, query, closed: false)
@q = disputes.order(:domain_name).search(query)
disputes = @q.result.page(params[:page])
disputes = @q.result.page(closed ? params[:closed_page] : params[:page])
return disputes.per(params[:results_per_page]) if params[:results_per_page].present?
disputes