Merge pull request #3525 from BrokenEagle/fix-index-default-order

Fix index default order
2018-01-29 13:11:24 -08:00
parent 5ea61c6921 d829ab3a00
commit 47bd812811
49 changed files with 134 additions and 115 deletions
--- a/app/models/user_feedback.rb
+++ b/app/models/user_feedback.rb
@@ -45,7 +45,6 @@ class UserFeedback < ApplicationRecord

    def search(params)
      q = super
-      return q if params.blank?

      if params[:user_id].present?
        q = q.for_user(params[:user_id].to_i)
@@ -67,7 +66,7 @@ class UserFeedback < ApplicationRecord
        q = q.where("category = ?", params[:category])
      end

-      q
+      q.apply_default_order(params)
    end
  end