mirror of
https://github.com/internetee/registry.git
synced 2025-05-21 11:49:40 +02:00
Story#105314040 filter domains under contacts
This commit is contained in:
parent
26b0ca7cdd
commit
ae5e5abfbc
2 changed files with 25 additions and 8 deletions
|
@ -353,19 +353,26 @@ class Contact < ActiveRecord::Base
|
||||||
# what we can do load firstly by registrant
|
# what we can do load firstly by registrant
|
||||||
# if total is smaller than needed, the load more
|
# if total is smaller than needed, the load more
|
||||||
# we also need to sort by valid_to
|
# we also need to sort by valid_to
|
||||||
|
# todo: extract to drapper. Then we can remove Domain#roles
|
||||||
def all_domains(page: nil, per: nil, params: {})
|
def all_domains(page: nil, per: nil, params: {})
|
||||||
sql = %Q{domains.id IN (
|
# compose filter sql
|
||||||
select domain_id from domain_contacts where contact_id=#{id}
|
filter_sql = case params[:domain_filter]
|
||||||
UNION
|
when "Registrant".freeze
|
||||||
select id from domains where registrant_id=#{id}
|
%Q{select id from domains where registrant_id=#{id}}
|
||||||
)}
|
when AdminDomainContact.to_s, TechDomainContact.to_s
|
||||||
|
%Q{select domain_id from domain_contacts where contact_id=#{id} AND type='#{params[:domain_filter]}'}
|
||||||
|
else
|
||||||
|
%Q{select domain_id from domain_contacts where contact_id=#{id} UNION select id from domains where registrant_id=#{id}}
|
||||||
|
end
|
||||||
|
|
||||||
|
# get sorting rules
|
||||||
sorts = params.fetch(:sort, {}).first || []
|
sorts = params.fetch(:sort, {}).first || []
|
||||||
sort = Domain.column_names.include?(sorts.first) ? sorts.first : "valid_to"
|
sort = Domain.column_names.include?(sorts.first) ? sorts.first : "valid_to"
|
||||||
order = {"asc"=>"desc", "desc"=>"asc"}[sorts.second] || "desc"
|
order = {"asc"=>"desc", "desc"=>"asc"}[sorts.second] || "desc"
|
||||||
|
|
||||||
|
|
||||||
domains = Domain.where(sql).includes(:registrar).page(page).per(per)
|
# fetch domains
|
||||||
|
domains = Domain.where("domains.id IN (#{filter_sql})").includes(:registrar).page(page).per(per)
|
||||||
if sorts.first == "registrar_name".freeze
|
if sorts.first == "registrar_name".freeze
|
||||||
# using small rails hack to generate outer join
|
# using small rails hack to generate outer join
|
||||||
domains = domains.includes(:registrar).where.not(registrars: {id: nil}).order("registrars.name #{order} NULLS LAST")
|
domains = domains.includes(:registrar).where.not(registrars: {id: nil}).order("registrars.name #{order} NULLS LAST")
|
||||||
|
@ -377,7 +384,7 @@ class Contact < ActiveRecord::Base
|
||||||
|
|
||||||
# adding roles. Need here to make faster sqls
|
# adding roles. Need here to make faster sqls
|
||||||
domain_c = Hash.new([])
|
domain_c = Hash.new([])
|
||||||
registrant_domains.where(id: domains.map(&:id)).each{|d| domain_c[d.id] |= ["Registrant"].freeze }
|
registrant_domains.where(id: domains.map(&:id)).each{|d| domain_c[d.id] |= ["Registrant".freeze] }
|
||||||
DomainContact.where(contact_id: id, domain_id: domains.map(&:id)).each{|d| domain_c[d.domain_id] |= [d.type] }
|
DomainContact.where(contact_id: id, domain_id: domains.map(&:id)).each{|d| domain_c[d.domain_id] |= [d.type] }
|
||||||
domains.each{|d| d.roles = domain_c[d.id].uniq}
|
domains.each{|d| d.roles = domain_c[d.id].uniq}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,16 @@
|
||||||
- domains = @contact.all_domains(page: params[:domain_page], per: 20, params: params)
|
- domains = @contact.all_domains(page: params[:domain_page], per: 20, params: params)
|
||||||
#contacts.panel.panel-default
|
#contacts.panel.panel-default
|
||||||
.panel-heading= t(:domains)
|
.panel-heading
|
||||||
|
.pull-left
|
||||||
|
= t(:domains)
|
||||||
|
.pull-right
|
||||||
|
= form_tag request.path, method: :get do
|
||||||
|
= select_tag :domain_filter, options_for_select(%w(Registrant AdminDomainContact TechDomainContact), selected: params[:domain_filter]),
|
||||||
|
include_blank: true, class: 'form-control2 selectize2'
|
||||||
|
%button.btn.btn-primary
|
||||||
|
%span.glyphicon.glyphicon-search
|
||||||
|
.clearfix
|
||||||
|
|
||||||
.table-responsive
|
.table-responsive
|
||||||
%table.table.table-hover.table-bordered.table-condensed
|
%table.table.table-hover.table-bordered.table-condensed
|
||||||
%thead
|
%thead
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue