From 1f1def4293f2f762b62c218fba80d661e90fdf6f Mon Sep 17 00:00:00 2001
From: Brian Shaughnessy <brian@lcdservices.biz>
Date: Fri, 24 Jul 2020 20:14:12 -0400
Subject: [PATCH] dev/core#1895 fix first/last name adv search

---
 CRM/Contact/BAO/Query.php                                 | 2 +-
 CRM/Contact/Form/Search/Criteria.php                      | 5 +++--
 .../CRM/Contact/Form/Search/Criteria/Fields/sort_name.tpl | 8 ++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/CRM/Contact/BAO/Query.php b/CRM/Contact/BAO/Query.php
index 45a7f7a4aa..95d8cb474b 100644
--- a/CRM/Contact/BAO/Query.php
+++ b/CRM/Contact/BAO/Query.php
@@ -1742,7 +1742,7 @@ class CRM_Contact_BAO_Query {
     }
 
     if (!$likeNames) {
-      $likeNames = ['sort_name', 'email', 'note', 'display_name'];
+      $likeNames = ['sort_name', 'first_name', 'last_name', 'email', 'note', 'display_name'];
     }
 
     // email comes in via advanced search
diff --git a/CRM/Contact/Form/Search/Criteria.php b/CRM/Contact/Form/Search/Criteria.php
index 61f44edeb6..8b60036e15 100644
--- a/CRM/Contact/Form/Search/Criteria.php
+++ b/CRM/Contact/Form/Search/Criteria.php
@@ -28,6 +28,9 @@ class CRM_Contact_Form_Search_Criteria {
     self::setBasicSearchFields($form);
     $form->addElement('hidden', 'hidden_basic', 1);
 
+    $form->add('text', 'first_name', ts('First Name'), CRM_Core_DAO::getAttribute('CRM_Contact_DAO_Contact', 'first_name'));
+    $form->add('text', 'last_name', ts('Last Name'), CRM_Core_DAO::getAttribute('CRM_Contact_DAO_Contact', 'last_name'));
+
     if ($form->_searchOptions['contactType']) {
       $contactTypes = CRM_Contact_BAO_ContactType::getSelectElements();
 
@@ -249,8 +252,6 @@ class CRM_Contact_Form_Search_Criteria {
         'template_grouping' => 'basic',
         'template' => 'CRM/Contact/Form/Search/Criteria/Fields/sort_name.tpl',
       ],
-      'first_name' => ['template_grouping' => 'basic'],
-      'last_name' => ['template_grouping' => 'basic'],
       'email' => ['title' => ts('Complete OR Partial Email'), 'entity' => 'Email', 'template_grouping' => 'basic'],
       'contact_tags' => ['name' => 'contact_tags', 'type' => CRM_Utils_Type::T_INT, 'is_pseudofield' => TRUE, 'template_grouping' => 'basic'],
       'created_date' => ['name' => 'created_date', 'template_grouping' => 'changeLog'],
diff --git a/templates/CRM/Contact/Form/Search/Criteria/Fields/sort_name.tpl b/templates/CRM/Contact/Form/Search/Criteria/Fields/sort_name.tpl
index cdda1797a9..9f5e98e57e 100644
--- a/templates/CRM/Contact/Form/Search/Criteria/Fields/sort_name.tpl
+++ b/templates/CRM/Contact/Form/Search/Criteria/Fields/sort_name.tpl
@@ -11,16 +11,16 @@
   <script type="text/javascript">
     CRM.$(function($) {
       function showIndivFldsSearch() {
-        $('#sortnameselect').hide();
-        $('#indivfldselect').show();
+        $('#sortnameselect').css('visibility', 'hidden').css('position','absolute');
+        $('#indivfldselect').css('visibility', 'visible').css('position','static');
         $('#sort_name').val('');
         $('#first_name').removeClass('big').addClass('eight');
         $('#last_name').removeClass('big').addClass('eight');
         return false;
       }
       function showSortNameSearch() {
-        $('#indivfldselect').hide();
-        $('#sortnameselect').show();
+        $('#indivfldselect').css('visibility', 'hidden').css('position','absolute');
+        $('#sortnameselect').css('visibility', 'visible').css('position','static');
         $('#first_name').val('');
         $('#last_name').val('');
         return false;
-- 
2.25.1