zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-24 11:38:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '108869472-objects_archive' into staging

Browse source
This commit is contained in:
Stas 2016-04-21 17:05:52 +03:00
commit 0a73085ac2
5 changed files with 51 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/admin/contact_versions_controller.rb
View file

@ -30,7 +30,7 @@ class Admin::ContactVersionsController < AdminController
def show
per_page = 7
@version = ContactVersion.find(params[:id])
@q = ContactVersion.where(item_id: @version.item_id).order(created_at: :asc).search
@q = ContactVersion.where(item_id: @version.item_id).order(created_at: :desc).search
@versions = @q.result.page(params[:page])
@versions = @versions.per(per_page)
end
@ -40,7 +40,7 @@ class Admin::ContactVersionsController < AdminController
end
def create_where_string(key, value)
" AND object->>'#{key}' ~ '#{value}'"
" AND object->>'#{key}' LIKE '%#{value}%'"
end
end

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

@ -8,13 +8,13 @@ class Admin::DomainVersionsController < AdminController
@versions = @q.result.page(params[:page])
search_params = params[:q].deep_dup
if search_params[:registrant]
registrant = Contact.find_by(name: search_params[:registrant].strip)
if search_params[:registrant].present?
registrants = Contact.where("name like ?", "%#{search_params[:registrant].strip}%")
search_params.delete(:registrant)
end
if search_params[:registrar]
registrar = Registrar.find_by(name: search_params[:registrar].strip)
if search_params[:registrar].present?
registrars = Registrar.where("name like ?", "%#{search_params[:registrar].strip}%")
search_params.delete(:registrar)
end
@ -30,8 +30,8 @@ class Admin::DomainVersionsController < AdminController
end
end
whereS += " AND object->>'registrant_id' = '#{registrant.id}'" if registrant
whereS += " AND object->>'registrar_id' = '#{registrar.id}'" if registrar
whereS += " AND object->>'registrant_id' IN (#{registrants.map { |r| "'#{r.id.to_s}'" }.join ','})" if registrants
whereS += " AND object->>'registrar_id' IN (#{registrars.map { |r| "'#{r.id.to_s}'" }.join ','})" if registrars
versions = DomainVersion.includes(:item).where(whereS)
@q = versions.search(params[:q])