Changeset 5466
- Timestamp:
- 02/02/12 14:20:40 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/js/QuickCatalogSearch.js
r5456 r5466 123 123 switch(data_['type_catalog']) { 124 124 case 'G': 125 if(data['extra_ldap_fields'].length != 0) 126 var extra_fields = (data['extra_ldap_fields']).split("#"); 127 else 128 var extra_fields = []; 125 if(data['extra_ldap_fields'] != undefined){ 126 if(data['extra_ldap_fields'].length != 0) 127 var extra_fields = (data['extra_ldap_fields']).split("#"); 128 else 129 var extra_fields = []; 130 }else 131 var extra_fields = []; 129 132 if(preferences.default_fields_quick_search != 0) { 130 details.append('<p><label class="attribute">' + utf8_decoder(data_[id_contact].cn[0]) + "</label>" + '<span class="value">' + data_[id_contact].mail[0]+ '</span></p>');131 if( data_[id_contact].telephonenumber[0] != null)132 details.append('<p><label class="attribute">Telefone </label>' + '<span class="value">' + data_[id_contact].telephonenumber[0]+ '</span></p>');133 details.append('<p><label class="attribute">' + utf8_decoder(data_[id_contact].cn[0]) + "</label>" + '<span class="value">' + (data_[id_contact].mail ? data_[id_contact].mail[0] : "") + '</span></p>'); 134 if((data_[id_contact].telephonenumber ? data_[id_contact].telephonenumber[0] : "")) 135 details.append('<p><label class="attribute">Telefone </label>' + '<span class="value">' + (data_[id_contact].telephonenumber ? data_[id_contact].telephonenumber[0] : "") + '</span></p>'); 133 136 } 134 137 for (var i=0; i<=extra_fields.length-1; i++) … … 154 157 break; 155 158 default: 156 if(data['extra_ldap_fields'].length != 0) 157 var extra_fields = (data['extra_ldap_fields']).split("#"); 158 else 159 if(data['extra_ldap_fields'] != undefined){ 160 if(data['extra_ldap_fields'].length != 0) 161 var extra_fields = (data['extra_ldap_fields']).split("#"); 162 else 163 var extra_fields = []; 164 }else{ 159 165 var extra_fields = []; 166 } 160 167 if(preferences.default_fields_quick_search != 0 || data_[id_contact].type_contact == "P") { 161 168 if(utf8_decoder(data_[id_contact].cn) == 'undefined') … … 270 277 else if(contact_name.toLowerCase().indexOf(data.search_for.toLowerCase()) != -1 && data.search_for.indexOf(" ") == -1 && data.search_for.indexOf("@") == -1) 271 278 contact_name = contact_name.substring(0, contact_name.toLowerCase().indexOf(data.search_for.toLowerCase())) + "<u>" + contact_name.substr(contact_name.toLowerCase().indexOf(data.search_for.toLowerCase()), data.search_for.length) + "</u>" + contact_name.substring(contact_name.toLowerCase().indexOf(data.search_for.toLowerCase()) + data.search_for.length); 272 var line = '<span class="menu-control"><button class="'+btnClass+'" id="actions_'+i+'" onClick="'+exist+'(document.getElementById(\'contact_' + i + '\').innerHTML, this, \'contact_' + i + '\')">'+ signal +'</button></span><div id="contact_' + i + '" onDblClick="'+exist+'(this.innerHTML, document.getElementById(\'actions_'+i+'\'), \'contact_' + i + '\')"><div class="name_contact"><strong class="name">' + contact_name + '</strong><em class="email">' + utf8_decoder(data[i-1].mail) + '</em></div></div>';279 var line = '<span class="menu-control"><button class="'+btnClass+'" id="actions_'+i+'" onClick="'+exist+'(document.getElementById(\'contact_' + i + '\').innerHTML, this, \'contact_' + i + '\')">'+ signal +'</button></span><div id="contact_' + i + '" onDblClick="'+exist+'(this.innerHTML, document.getElementById(\'actions_'+i+'\'), \'contact_' + i + '\')"><div class="name_contact"><strong class="name">' + contact_name + '</strong><em class="email">' + ((utf8_decoder(data[i-1].mail) != undefined)? (utf8_decoder(data[i-1].mail) == 'undefined' ? get_lang("No mail") : utf8_decoder(data[i-1].mail)) : get_lang("No mail")) + '</em></div></div>'; 273 280 Op.innerHTML = line; 274 281 $(Op).val(i - 1); … … 285 292 switch (data['type_catalog']) { 286 293 case 'G': 287 if(data['extra_ldap_fields'].length != 0) 288 var extra_fields = (data['extra_ldap_fields']).split("#"); 289 else 294 if(data['extra_ldap_fields']){ 295 if(data['extra_ldap_fields'].length != 0) 296 var extra_fields = (data['extra_ldap_fields']).split("#"); 297 else 298 var extra_fields = []; 299 }else 290 300 var extra_fields = []; 291 301 if(preferences.default_fields_quick_search != 0) { 292 details.append('<p><label class="attribute">' + utf8_decoder(data[first_contact].cn[0]) + "</label>" + '<span class="value">' + data[first_contact].mail[0] + "</span></p>"); 293 details.append('<p><label class="attribute">Telefone</label>' + '<span class="value">' + data[first_contact].telephonenumber[0] + '</span></p>'); 302 details.append('<p><label class="attribute">' + utf8_decoder(data[first_contact].cn[0]) + "</label>" + '<span class="value">' + (data[first_contact].mail ? data[first_contact].mail[0] : "") + "</span></p>"); 303 if(data[first_contact].telephonenumber) 304 details.append('<p><label class="attribute">Telefone</label>' + '<span class="value">' + (data[first_contact].telephonenumber ? data[first_contact].telephonenumber[0] : "") + '</span></p>'); 294 305 } 295 306 for (var i=0; i<=extra_fields.length-1; i++) { … … 315 326 break; 316 327 default: 317 if(data['extra_ldap_fields'].length != 0) 318 var extra_fields = (data['extra_ldap_fields']).split("#"); 319 else 328 if(data['extra_ldap_fields']){ 329 if(data['extra_ldap_fields'].length != 0) 330 var extra_fields = (data['extra_ldap_fields']).split("#"); 331 else 332 var extra_fields = []; 333 }else 320 334 var extra_fields = []; 321 335 if(preferences.default_fields_quick_search != 0 || data[first_contact].type_contact == "P") { … … 366 380 switch(data['type_catalog']) { 367 381 case 'G': 368 if(data['extra_ldap_fields'].length != 0) 369 var extra_fields = (data['extra_ldap_fields']).split("#"); 370 else 382 if(data['extra_ldap_fields'] != undefined){ 383 if(data['extra_ldap_fields'].length != 0) 384 var extra_fields = (data['extra_ldap_fields']).split("#"); 385 else 386 var extra_fields = []; 387 }else 371 388 var extra_fields = []; 372 389 if(preferences.default_fields_quick_search != 0) { 373 details.append('<p><label class="attribute">' + utf8_decoder(data[this.value].cn[0]) + "</label>" + '<span class="value">' + data[this.value].mail[0] + "</span></p>"); 374 details.append('<p><label class="attribute">Telefone</label>' + '<span class="value">' + data[this.value].telephonenumber[0] + "</span></p>"); 390 details.append('<p><label class="attribute">' + utf8_decoder(data[this.value].cn[0]) + "</label>" + '<span class="value">' + (data[this.value].mail ? data[this.value].mail[0] : "")+ "</span></p>"); 391 if(data[this.value].telephonenumber ) 392 details.append('<p><label class="attribute">Telefone</label>' + '<span class="value">' + (data[this.value].telephonenumber ? data[this.value].telephonenumber[0] : "")+ "</span></p>"); 375 393 } 376 394 for (var i=0; i<=extra_fields.length-1; i++) {
Note: See TracChangeset
for help on using the changeset viewer.