Merge remote-tracking branch 'origin/110152326-is_registrant_filter' into staging

app/controllers/admin/contacts_controller.rb

@@ -4,8 +4,14 @@ class Admin::ContactsController < AdminController
 
   def index
     params[:q] ||= {}
-    @q = Contact.includes(:registrar).search(params[:q])
+    search_params = params[:q].deep_dup
-    @contacts = @q.result.page(params[:page])
+
+    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(distinct: :true).page(params[:page])
 
     if params[:statuses_contains]
       contacts = Contact.includes(:registrar).where(
@@ -16,8 +22,8 @@ class Admin::ContactsController < AdminController
     end
 
     normalize_search_parameters do
-      @q = contacts.search(params[:q])
+      @q = contacts.search(search_params)
-      @contacts = @q.result.page(params[:page])
+      @contacts = @q.result(distinct: :true).page(params[:page])
     end
 
     @contacts = @contacts.per(params[:results_per_page]) if params[:results_per_page].to_i > 0

app/controllers/registrar/contacts_controller.rb

@@ -6,8 +6,15 @@ class Registrar::ContactsController < Registrar::DeppController # EPP controller
 
     params[:q] ||= {}
     params[:q].delete_if { |_k, v| v.blank? }
-    if params[:q].length == 1 && params[:q][:name_matches].present?
+
-      @contacts = Contact.find_by(name: params[:q][:name_matches])
+    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
+
+    if search_params.length == 1 && search_params[:name_matches].present?
+      @contacts = Contact.find_by(name: search_params[:name_matches])
     end
 
     if params[:statuses_contains]
@@ -19,7 +26,7 @@ class Registrar::ContactsController < Registrar::DeppController # EPP controller
     end
 
     normalize_search_parameters do
-      @q = contacts.search(params[:q])
+      @q = contacts.search(search_params)
       @contacts = @q.result.page(params[:page])
     end
 

app/views/admin/contacts/index.haml

@@ -29,15 +29,10 @@
           .form-group
             = label_tag t(:country)
             = select_tag '[q][country_code_eq]', SortedCountry.all_options(params[:q][:country_code_eq]), { include_blank: true, placeholder: t(:choose), class: 'form-control selectize' }
-        .col-md-3
+        .col-md-6
-          .form-group
-            = f.label t(:is_registrant)
-            %div
-              = f.check_box :registrant_domains_id_not_null
-        .col-md-3
           .form-group
             = 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
         .col-md-3
           .form-group

app/views/registrar/contacts/index.haml

@@ -31,15 +31,10 @@
           .form-group
             = label_tag t(:country)
             = select_tag '[q][country_code_eq]', SortedCountry.all_options(params[:q][:country_code_eq]), { include_blank: true, placeholder: t(:choose), class: 'form-control selectize' }
-        .col-md-3
+        .col-md-6
-          .form-group
-            = f.label t(:is_registrant)
-            %div
-              = f.check_box :registrant_domains_id_not_null
-        .col-md-3
           .form-group
             = 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
         .col-md-3
           .form-group