Changeset 7181 for branches/2.4

Timestamp:

09/06/12 16:33:43 (12 years ago)

Author:

eduardow

Message:

Ticket #3089 - Problema com os participantes externos na criação de compromisso.

Location:

branches/2.4

Files:

• calendar/templates/default/js/edit_exmail.js (modified) (4 diffs)
• calendar/templates/default/js/quickSearch.js (added)
• index.php (modified) (1 diff)

branches/2.4/calendar/templates/default/js/edit_exmail.js

@@ -341 +341 @@
                 if((e.keyCode) == 120){
                         
+                        quickSearchCatalogUser(); 
                         e.preventDefault();
                         return false;
@@ -399 +400 @@
 }
 
+function quickSearchCatalogUser(){ 
+    var begin,end; 
+    var mailList = document.getElementById('ex_participants').value; 
+    var search =  "";
+    var ID = 1; 
+    var field = "ex_participants"; 
+    if (mailList.lastIndexOf(',') != -1){ 
+            begin = mailList.lastIndexOf(','); 
+            end = mailList.length; 
+            search = mailList.substring(begin+1,255); 
+    } 
+    else{ 
+            begin = 0; 
+            end = mailList.length; 
+            search = mailList; 
+    } 
+    var handler_Search = function(data){ 
+            if ((!data.status) && (data.error == "many results")){ 
+                    return false; 
+            } 
+            if (data && data.length > 0){
+                    quickSearchUser.showList(data,begin,end); 
+            } 
+    } 
+    if (search.length > 0) 
+    cExecute ("$this.ldap_functions.quicksearchcontact&search_for="+search+"&field="+field+"&ID="+ID, handler_Search); 
+} 
+
 /*Adiciona um novo contato selecionado*/
-function update_mailField(email){
+function update_mailField(name,email){ 
         var mailList = $('#tbl_ext_participants').find('textarea');
         var newList = "";
@@ -411 +440 @@
                         newList += ctcList[ii] + ",";
                 }
-                newList += email + ",";
+                newList += '"'+ name + '"'+ " <" + email + ">" + ",";
         }
         else{
-                newList += email+",";
+                newList +=  '"'+ name + '"'+ " <" + email + ">" +",";
         }
         mailList.val(newList);
@@ -493 +522 @@
                         select: function( event, ui ) {                 
                                 event.preventDefault();
-                                update_mailField(ui.item.mail);
+                                update_mailField((ui.item.name ? ui.item.name : ""),ui.item.mail);
                         },
                         position : { my: "left top", at: "left bottom", collision: "fit" }

branches/2.4/index.php

@@ -156 +156 @@
                               <script type="text/javascript" src="prototype/plugins/jq-raty/js/jquery.raty.min.js"></script> 
                               <script type="text/javascript">DataLayer.dispatchPath = "/"; REST.dispatchPath = "prototype/";REST.load("")</script> 
-                          <script src="expressoMail1_2/js/QuickCatalogSearch.js" type="text/javascript"></script> 
+                          <script src="expressoMail1_2/js/common_functions.js" type="text/javascript"></script> 
                               <link rel="stylesheet" type="text/css" href="prototype/plugins/zebradialog/css/zebra_dialog.css"></link> 
-                              <script type="text/javascript" src="prototype/plugins/zebradialog/javascript/zebra_dialog.js"></script>';
+                              <script type="text/javascript" src="prototype/plugins/zebradialog/javascript/zebra_dialog.js"></script>        
+                              <script type="text/javascript" src="calendar/templates/default/js/quickSearch.js"></script> 
+                             <script src="expressoMail1_2/js/ccQuickAdd.js" type="text/javascript"></script> 
+                            '; 
                         }
                 }