From 0998ada2fccea1638e41d0c2b2e3841af1cff0eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karl=20Erik=20=C3=95unapuu?= <karlerik@kreative.ee>
Date: Tue, 19 May 2020 12:25:04 +0300
Subject: [PATCH] Fix pagination/sorting for disputed domains

---
 app/controllers/admin/disputes_controller.rb |  6 +++---
 app/views/admin/disputes/index.html.erb      | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/controllers/admin/disputes_controller.rb b/app/controllers/admin/disputes_controller.rb
index ae187f86b..8a8997f63 100644
--- a/app/controllers/admin/disputes_controller.rb
+++ b/app/controllers/admin/disputes_controller.rb
@@ -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
diff --git a/app/views/admin/disputes/index.html.erb b/app/views/admin/disputes/index.html.erb
index c4bd094a9..e32ddb730 100644
--- a/app/views/admin/disputes/index.html.erb
+++ b/app/views/admin/disputes/index.html.erb
@@ -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">