zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-17 09:57:23 +02:00
Code Issues Projects Releases Packages Wiki Activity

110152326-is_registrant_filter_modification

Browse source
This commit is contained in:
Stas 2016-01-04 16:35:02 +02:00
parent 3c33a44f38
commit f46c7f5543
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,7 +4,13 @@ class Admin::ContactsController < AdminController
def index def index
params[:q] ||= {} params[:q] ||= {}
@q = Contact.includes(:registrar).search(params[:q]) search_params = params[:q].deep_dup
if search_params[:domain_contacts_type_in].is_a?(Array) && search_params[:domain_contacts_type_in].delete('registrant')
search_params[:registrant_domains_id_not_null] = 1
end
@q = Contact.includes(:registrar).search(search_params)
@contacts = @q.result.page(params[:page]) @contacts = @q.result.page(params[:page])
if params[:statuses_contains] if params[:statuses_contains]
@ -16,7 +22,7 @@ class Admin::ContactsController < AdminController
end end
normalize_search_parameters do normalize_search_parameters do
@q = contacts.search(params[:q]) @q = contacts.search(search_params)
@contacts = @q.result.page(params[:page]) @contacts = @q.result.page(params[:page])
end end

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

@ -37,7 +37,7 @@
.col-md-3 .col-md-3
.form-group .form-group
= label_tag t(:contact_type) = label_tag t(:contact_type)
= select_tag '[q][domain_contacts_type_in]', options_for_select([['admin', 'AdminDomainContact'], ['tech', 'TechDomainContact']], params[:q][:domain_contacts_type_in]), { multiple: true, placeholder: t(:choose), class: 'form-control js-combobox' } = select_tag '[q][domain_contacts_type_in]', options_for_select([['admin', 'AdminDomainContact'], ['tech', 'TechDomainContact'], ['registrant', 'registrant']], params[:q][:domain_contacts_type_in]), { multiple: true, placeholder: t(:choose), class: 'form-control js-combobox' }
.row .row
.col-md-3 .col-md-3
.form-group .form-group