Changeset 5196 for trunk

Timestamp:

11/23/11 10:26:16 (12 years ago)

Author:

clairson

Message:

Ticket #2330 - Pesquisa de contatos do ExpressoMail? falha ao ativar preferencia

Location:

trunk/expressoMail1_2

Files:

• inc/class.ldap_functions.inc.php (modified) (1 diff)
• js/common_functions.js (modified) (4 diffs)
• templates/default/index.tpl (modified) (1 diff)

trunk/expressoMail1_2/inc/class.ldap_functions.inc.php

@@ -258 +258 @@
         function quicksearchcontact($params)
         {
+            if($params['Type'] != "undefined"){
+                return $this->quickSearch($params);
+            }
             $modal = false;
             if($params['catalog'])

trunk/expressoMail1_2/js/common_functions.js

@@ -540 +540 @@
 }
 
-function emQuickSearch(emailList, field, ID){
+function emQuickSearch(emailList, field, ID, Type){
         var quickSearchKeyBegin;
         var quickSearchKeyEnd;
@@ -551 +551 @@
                 connector.loadScript("QuickCatalogSearch");
                 if (typeof(QuickCatalogSearch) == 'undefined'){
-                        setTimeout('emQuickSearch("'+emailList+'", "'+field+'", "'+ID+'")',500);
+                        setTimeout('emQuickSearch("'+emailList+'", "'+field+'", "'+ID+'", "'+Type+'")',500);
                         return false;
                 }
@@ -559 +559 @@
                 connector.loadScript("QuickSearchUser");
                 if (typeof(QuickSearchUser) == 'undefined'){
-                        setTimeout('emQuickSearch("'+emailList+'", "'+field+'", "'+ID+'")',500);
+                        setTimeout('emQuickSearch("'+emailList+'", "'+field+'", "'+ID+'", "'+Type+'")',500);
                         return false;
                 }
@@ -611 +611 @@
             return false;
         }
-
-        cExecute ("$this.ldap_functions.quicksearchcontact&search_for="+search_for+"&field="+field+"&ID="+ID, handler_emQuickSearch);
+        if(Type === 'undefined')
+            cExecute ("$this.ldap_functions.quicksearchcontact&search_for="+search_for+"&field="+field+"&ID="+ID, handler_emQuickSearch);
+        else
+            cExecute ("$this.ldap_functions.quicksearchcontact&search_for="+search_for+"&field="+field+"&ID="+ID+"&Type="+Type, handler_emQuickSearch);
 }
 

trunk/expressoMail1_2/templates/default/index.tpl

@@ -25 +25 @@
                                                                 <a style="padding:1 8px; width:16px; height:16px; background: url(templates/default/images/search.gif) no-repeat center; margin: 0 3px;" class="" onMouseOut="window.status='';return true;" title='{lang_Open_Search_Window}' onMouseOver="window.status='{lang_Open_Search_Window}';return true;" href="javascript:void(0);"  onClick="javascript:search_emails(Element('em_message_search').value)"></a> 
                                                                 
-                                                                <a style="padding:1 8px; width:16px; height:16px; background: url(templates/default/images/users.gif) no-repeat center;" class="" onMouseOut="window.status='';return true;" title='{lang_search_user}' onMouseOver="window.status='{lang_search_user}' ;return true;" href="javascript:void(0);"  onClick="javascript:emQuickSearch(Element('em_message_search').value, 'null', 'null')"></a> 
+                                                                <a style="padding:1 8px; width:16px; height:16px; background: url(templates/default/images/users.gif) no-repeat center;" class="" onMouseOut="window.status='';return true;" title='{lang_search_user}' onMouseOver="window.status='{lang_search_user}' ;return true;" href="javascript:void(0);"  onClick="javascript:emQuickSearch(Element('em_message_search').value, 'null', 'null', 'expressoMail')"></a> 
                                                         </td>
                                                 </tr>