zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-06-11 23:24:48 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix pagination/sorting for disputed domains

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/admin/disputes_controller.rb
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

14
app/views/admin/disputes/index.html.erb
View file

@ -8,8 +8,8 @@
<div class="row">
<div class="col-md-3">
<div class="form-group">
<%= f.label :name %>
<%= f.search_field :name_matches, value: params[:q][:name_matches], class: 'form-control', placeholder: t(:name) %>
<%= f.label :domain_name %>
<%= f.search_field :domain_name_matches, value: params[:q][:domain_name_matches], class: 'form-control', placeholder: t(:name) %>
</div>
</div>
<div class="col-md-3">
@ -53,7 +53,7 @@
<thead>
<tr>
<th class="col-xs-2">
<%= sort_link(@q, 'name') %>
<%= sort_link(@q, 'domain_name') %>
</th>
<th class="col-xs-2">
<%= sort_link(@q, 'password') %>
@ -122,16 +122,16 @@
<thead>
<tr>
<th class="col-xs-2">
<%= sort_link(@q, 'name') %>
<%= sort_link(@q, 'domain_name') %>
</th>
<th class="col-xs-2">
<%= sort_link(@q, 'Initiator') %>
<%= sort_link(@q, 'initiator') %>
</th>
<th class="col-xs-2">
<%= sort_link(@q, 'starts_at') %>
</th>
<th class="col-xs-2">
<%= sort_link(@q, 'Expired/Closed At') %>
<%= sort_link(@q, 'closed') %>
</th>
<th class="col-xs-2">
<%= sort_link(@q, 'comment') %>
@ -165,7 +165,7 @@
</div>
<div class="row">
<div class="col-md-6">
<%= paginate @closed_disputes %>
<%= paginate @closed_disputes, param_name: :closed_page %>
</div>
<div class="col-md-6 text-right">
<div class="pagination">