From 81aa6678ff562e57916914d6800b069696725248 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 14 Mar 2013 21:42:34 -0700
Subject: [PATCH] Alter quicksearch to redirect to advanced search CRM-12120

---
 CRM/Contact/Form/Search/Advanced.php |  2 +-
 templates/CRM/common/Navigation.tpl  | 39 +++++++++-------------------
 2 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/CRM/Contact/Form/Search/Advanced.php b/CRM/Contact/Form/Search/Advanced.php
index 3426f96a88..a3892ba35a 100644
--- a/CRM/Contact/Form/Search/Advanced.php
+++ b/CRM/Contact/Form/Search/Advanced.php
@@ -245,7 +245,7 @@ class CRM_Contact_Form_Search_Advanced extends CRM_Contact_Form_Search {
       }
 
       // set the group if group is submitted
-      if ($this->_formValues['uf_group_id']) {
+      if (!empty($this->_formValues['uf_group_id'])) {
         $this->set('id', $this->_formValues['uf_group_id']);
       }
       else {
diff --git a/templates/CRM/common/Navigation.tpl b/templates/CRM/common/Navigation.tpl
index f576a15006..6276100513 100644
--- a/templates/CRM/common/Navigation.tpl
+++ b/templates/CRM/common/Navigation.tpl
@@ -27,12 +27,13 @@
     <ul id="civicrm-menu">
         {if call_user_func(array('CRM_Core_Permission','giveMeAllACLs'))}
         <li id="crm-qsearch" class="menumain crm-link-home">
-            <form action="{crmURL p='civicrm/contact/search/basic' h=0 }" name="search_block" id="id_search_block" method="post" onsubmit="getSearchURLValue( );">
+            <form action="{crmURL p='civicrm/contact/search/advanced' h=0 }" name="search_block" id="id_search_block" method="post" onsubmit="getSearchURLValue( );">
               <div id="quickSearch">
                 <input type="text" class="form-text" id="sort_name_navigation" placeholder="{ts}Find Contacts{/ts}" name="sort_name" style="width: 12em;" />
-                <input type="hidden" id="sort_contact_id" value="" />
+                <input type="text" id="sort_contact_id" style="display: none" />
+                <input type="hidden" name="hidden_location" value="1" />
                 <input type="hidden" name="qfKey" value="{crmKey name='CRM_Contact_Controller_Search' addSequence=1}" />
-                <input type="submit" value="{ts}Go{/ts}" name="_qf_Basic_refresh" class="form-submit default" style="display: none;" />
+                <div style="height:1px; overflow:hidden;"><input type="submit" value="{ts}Go{/ts}" name="_qf_Advanced_refresh" class="form-submit default" /></div>
               </div>
             </form>
           <ul>
@@ -57,31 +58,10 @@
 
 {literal}
 <script type="text/javascript">
-cj( document ).ready( function( ) {
-  //CRM-6776, enter-to-submit functionality is broken for IE due to hidden field
+cj(function( ) {
   cj("#civicrm-menu >li").each(function(i){
     cj(this).attr("tabIndex",i+2);
   });
-  var htmlContent = '';
-  if ( cj.browser.msie ) {
-    if( cj.browser.version.substr( 0,1 ) == '7' ) {
-      htmlContent = '<input type="submit" value="Go" name="_qf_Basic_refresh" class="form-submit default" style ="margin-right: -5px" />';
-    } else {
-      htmlContent = '<input type="submit" value="Go" name="_qf_Basic_refresh" class="form-submit default" />';
-    }
-    htmlContent += '<input type="text" class="form-text" id="sort_name_navigation" placeholder="{/literal}{ts escape='js'}Find Contacts{/ts}{literal}" name="sort_name" style="width: 12em; margin-left: -45px;" /><input type="text" id="sort_contact_id" style="display: none" />';
-    htmlContent += '<input type="hidden" name="qfKey" value="' + {/literal}'{crmKey name='CRM_Contact_Controller_Search' addSequence=1}'{literal} + '" />';
-    cj('#quickSearch').html(htmlContent);
-  }
-
-  cj( "#admin-menu>ul>li>a" ).each( function( ) {
-      if ( cj( this ).html( ) == 'CiviCRM' ) {
-          cj( this ).click ( function( ) {
-              cj( "#civicrm-menu" ).toggle( );
-              return false;
-          });
-      }
-   });
 
   var contactUrl = {/literal}"{crmURL p='civicrm/ajax/rest' q='className=CRM_Contact_Page_AJAX&fnName=getContactList&json=1&context=navigation' h=0 }"{literal};
 
@@ -102,7 +82,7 @@ cj( document ).ready( function( ) {
         }
       }
   }).result(function(event, data, formatted) {
-     document.location={/literal}"{crmURL p='civicrm/contact/view' h=0 q='reset=1&cid='}"{literal}+data[1];
+     document.location = CRM.url('civicrm/contact/view', {reset: 1, cid: data[1]});
      return false;
   });
   cj('#sort_name_navigation').keydown(function() {
@@ -110,7 +90,12 @@ cj( document ).ready( function( ) {
   });
   cj('.crm-quickSearchField').click(function() {
     var label = cj(this).text();
-    cj('#sort_name_navigation').attr('placeholder', label).flushCache().focus();
+    var value = cj('input', this).val();
+    // These fields are not supported by advanced search
+    if (value === 'first_name' || value === 'last_name') {
+      value = 'sort_name';
+    }
+    cj('#sort_name_navigation').attr({name: value, placeholder: label}).flushCache().focus();
   });
 });
 function getSearchURLValue( )
-- 
2.25.1