zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-21 03:39:40 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '108869472-objects_archive' into staging

Browse source
This commit is contained in:
Vladimir Krylov 2016-05-31 08:20:03 +03:00
commit de17f72dc0
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/admin/domain_versions_controller.rb
View file

@ -30,8 +30,10 @@ class Admin::DomainVersionsController < AdminController
end end
end end
whereS += " AND object->>'registrant_id' IN (#{registrants.map { |r| "'#{r.id.to_s}'" }.join ','})" if registrants whereS += " AND object->>'registrant_id' IN (#{registrants.map { |r| "'#{r.id.to_s}'" }.join ','})" if registrants.present?
whereS += " AND object->>'registrar_id' IN (#{registrars.map { |r| "'#{r.id.to_s}'" }.join ','})" if registrars whereS += " AND 1=0" if registrants == []
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)
@q = versions.search(params[:q]) @q = versions.search(params[:q])