From 19e5fbdffadf709590bf3959f325b453a7041fd1 Mon Sep 17 00:00:00 2001 From: Stas Paaslane Date: Tue, 2 Aug 2016 23:05:28 +0300 Subject: [PATCH] 108869472-main_version_page_sorting --- app/controllers/admin/contact_versions_controller.rb | 2 +- app/controllers/admin/domain_versions_controller.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/admin/contact_versions_controller.rb b/app/controllers/admin/contact_versions_controller.rb index 2538350be..491daf083 100644 --- a/app/controllers/admin/contact_versions_controller.rb +++ b/app/controllers/admin/contact_versions_controller.rb @@ -20,7 +20,7 @@ class Admin::ContactVersionsController < AdminController end end - versions = ContactVersion.includes(:item).where(whereS) + versions = ContactVersion.includes(:item).where(whereS).order(created_at: :desc, id: :desc) @q = versions.search(params[:q]) @versions = @q.result.page(params[:page]) @versions = @versions.per(params[:results_per_page]) if params[:results_per_page].to_i > 0 diff --git a/app/controllers/admin/domain_versions_controller.rb b/app/controllers/admin/domain_versions_controller.rb index 1ca67b33d..8e350c247 100644 --- a/app/controllers/admin/domain_versions_controller.rb +++ b/app/controllers/admin/domain_versions_controller.rb @@ -37,7 +37,7 @@ class Admin::DomainVersionsController < AdminController whereS += " AND object->>'registrar_id' IN (#{registrars.map { |r| "'#{r.id.to_s}'" }.join ','})" if registrars.present? whereS += " AND 1=0" if registrars == [] - versions = DomainVersion.includes(:item).where(whereS) + versions = DomainVersion.includes(:item).where(whereS).order(created_at: :desc, id: :desc) @q = versions.search(params[:q]) @versions = @q.result.page(params[:page]) @versions = @versions.per(params[:results_per_page]) if params[:results_per_page].to_i > 0