From 7663e1b37fde8f479b6824e1e0b85d1b2ce08351 Mon Sep 17 00:00:00 2001 From: dinsmol Date: Tue, 14 Sep 2021 14:02:05 +0300 Subject: [PATCH] fixed errors after conflict resolving --- 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 f8b180a65..528059c19 100644 --- a/app/controllers/admin/contact_versions_controller.rb +++ b/app/controllers/admin/contact_versions_controller.rb @@ -24,7 +24,7 @@ module Admin end end - versions = Version::ContactVersion.includes(:item).where(whereS).order(created_at: :desc, id: :desc) + versions = Version::ContactVersion.includes(:item).where(where_s).order(created_at: :desc, id: :desc) @q = versions.ransack(params[:q]) @versions = @q.result.page(params[:page]) diff --git a/app/controllers/admin/domain_versions_controller.rb b/app/controllers/admin/domain_versions_controller.rb index 99e4415a7..fda6ac5d9 100644 --- a/app/controllers/admin/domain_versions_controller.rb +++ b/app/controllers/admin/domain_versions_controller.rb @@ -45,7 +45,7 @@ module Admin end where_s += " AND 1=0" if registrars == [] - versions = Version::DomainVersion.includes(:item).where(whereS).order(created_at: :desc, id: :desc) + versions = Version::DomainVersion.includes(:item).where(where_s).order(created_at: :desc, id: :desc) @q = versions.ransack(params[:q]) @versions = @q.result.page(params[:page])