From f2a7d3c41af379cc65316d45bbfc7b5f7bc4b73e Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Sun, 4 Feb 2018 16:46:42 -0600
Subject: [PATCH] /janitor_trials, /ip_bans: fix default ordering.

---
 app/controllers/janitor_trials_controller.rb | 3 +--
 app/models/ip_ban.rb                         | 5 ++---
 app/models/janitor_trial.rb                  | 5 ++---
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/controllers/janitor_trials_controller.rb b/app/controllers/janitor_trials_controller.rb
index 49c7f8db1..d9235415e 100644
--- a/app/controllers/janitor_trials_controller.rb
+++ b/app/controllers/janitor_trials_controller.rb
@@ -13,8 +13,7 @@ class JanitorTrialsController < ApplicationController
   end
 
   def index
-    @search = JanitorTrial.search(params[:search])
-    @janitor_trials = @search.paginate(params[:page], :limit => params[:limit])
+    @janitor_trials = JanitorTrial.search(params[:search]).paginate(params[:page], :limit => params[:limit])
     respond_with(@janitor_trials)
   end
 
diff --git a/app/models/ip_ban.rb b/app/models/ip_ban.rb
index 0243c4bf2..c60b76bd9 100644
--- a/app/models/ip_ban.rb
+++ b/app/models/ip_ban.rb
@@ -18,14 +18,13 @@ class IpBan < ApplicationRecord
   end
 
   def self.search(params)
-    q = where("true")
-    return q if params.blank?
+    q = super
 
     if params[:ip_addr].present?
       q = q.where("ip_addr = ?", params[:ip_addr])
     end
 
-    q
+    q.apply_default_order(params)
   end
 
   def self.query(user_ids)
diff --git a/app/models/janitor_trial.rb b/app/models/janitor_trial.rb
index 14d3504e9..053a082c9 100644
--- a/app/models/janitor_trial.rb
+++ b/app/models/janitor_trial.rb
@@ -10,8 +10,7 @@ class JanitorTrial < ApplicationRecord
   validates_uniqueness_of :user_id
 
   def self.search(params)
-    q = where("status = ?", "active")
-    return q if params.blank?
+    q = super.where(status: "active")
 
     if params[:user_name]
       q = q.where("user_id = (select _.id from users _ where lower(_.name) = ?)", params[:user_name].mb_chars.downcase)
@@ -21,7 +20,7 @@ class JanitorTrial < ApplicationRecord
       q = q.where("user_id = ?", params[:user_id].to_i)
     end
 
-    q
+    q.apply_default_order(params)
   end
 
   def self.message_candidates!