zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-18 10:19:45 +02:00
Code Issues Projects Releases Packages Wiki Activity

117350717-sorting_fixes

Browse source
This commit is contained in:
Stas 2016-04-25 18:13:52 +03:00
parent 572a3f4e1d
commit f45b497876
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/controllers/admin/contacts_controller.rb
View file

@ -10,22 +10,22 @@ class Admin::ContactsController < AdminController
search_params[:registrant_domains_id_not_null] = 1 search_params[:registrant_domains_id_not_null] = 1
end end
@q = Contact.includes(:registrar).search(search_params) @q = Contact.includes(:registrar).joins(:registrar).select('contacts.*, registrars.name').search(search_params)
@contacts = @q.result(distinct: :true).page(params[:page]) @contacts = @q.result(distinct: :true).page(params[:page])
if params[:statuses_contains] if params[:statuses_contains]
contacts = Contact.includes(:registrar).where( contacts = Contact.includes(:registrar).joins(:registrar).select('contacts.*, registrars.name').where(
"contacts.statuses @> ?::varchar[]", "{#{params[:statuses_contains].join(',')}}" "contacts.statuses @> ?::varchar[]", "{#{params[:statuses_contains].join(',')}}"
) )
else else
contacts = Contact.includes(:registrar) contacts = Contact.includes(:registrar).joins(:registrar).select('contacts.*, registrars.name')
end end
contacts = contacts.where("ident_country_code is null or ident_country_code=''") if params[:only_no_country_code].eql?('1') contacts = contacts.where("ident_country_code is null or ident_country_code=''") if params[:only_no_country_code].eql?('1')
normalize_search_parameters do normalize_search_parameters do
@q = contacts.search(search_params) @q = contacts.includes(:registrar).joins(:registrar).select('contacts.*, registrars.name').search(search_params)
@contacts = @q.result(distinct: :true).page(params[:page]) @contacts = @q.result.uniq.page(params[:page])
end end
@contacts = @contacts.per(params[:results_per_page]) if params[:results_per_page].to_i > 0 @contacts = @contacts.per(params[:results_per_page]) if params[:results_per_page].to_i > 0

2
app/controllers/admin/domains_controller.rb
View file

@ -9,7 +9,7 @@ class Admin::DomainsController < AdminController
params[:q] ||= {} params[:q] ||= {}
if params[:statuses_contains] if params[:statuses_contains]
domains = Domain.includes(:registrar, :registrant).where( domains = Domain.includes(:registrar, :registrant).where(
"statuses @> ?::varchar[]", "{#{params[:statuses_contains].join(',')}}" "domains.statuses @> ?::varchar[]", "{#{params[:statuses_contains].join(',')}}"
) )
else else
domains = Domain.includes(:registrar, :registrant) domains = Domain.includes(:registrar, :registrant)

2
app/views/admin/account_activities/index.haml
View file

@ -56,7 +56,7 @@
%thead %thead
%tr %tr
%th{class: 'col-xs-2'} %th{class: 'col-xs-2'}
= sort_link(@q, 'registrar') = sort_link(@q, 'account_registrar_code', t(:registrar))
%th{class: 'col-xs-3'} %th{class: 'col-xs-3'}
= sort_link(@q, 'description') = sort_link(@q, 'description')
%th{class: 'col-xs-2'} %th{class: 'col-xs-2'}