zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-08-05 01:11:43 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '105842700-registrants_portal' into staging

Browse source
This commit is contained in:
Vladimir Krylov 2016-03-15 14:56:24 +02:00
commit 332fd9cc21
3 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/models/contact.rb
View file

@ -424,7 +424,10 @@ class Contact < ActiveRecord::Base
# fetch domains
domains = Domain.where("domains.id IN (#{filter_sql})").includes(:registrar).page(page).per(per)
domains = Domain.where("domains.id IN (#{filter_sql})")
domains = domains.where("domains.id" => params[:leave_domains]) if params[:leave_domains]
domains = domains.includes(:registrar).page(page).per(per)
if sorts.first == "registrar_name".freeze
# using small rails hack to generate outer join
domains = domains.includes(:registrar).where.not(registrars: {id: nil}).order("registrars.name #{order} NULLS LAST")