Changeset 6460
- Timestamp:
- 06/11/12 18:11:01 (12 years ago)
- Location:
- sandbox/2.4.1-3
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
sandbox/2.4.1-3/expressoMail1_2/js/doiMenuData.js
r6374 r6460 306 306 307 307 function loadExtraLDAPBox(data, element){ 308 //menuItensLabel[index] = {type: "label", customName: menuItems[index].name}; 308 menuItensLabel = {}; 309 menuItensLabel["Name"] = {name: "<b>"+data[0].value+"</b>", disabled: true}; 310 menuItensLabel["Email"] = {name: data[1].value, disabled: true}; 311 if(data[2].value){ 312 menuItensLabel["TelefoneLabel"] = {name: "<b>Telefone</b>", disabled: true}; 313 menuItensLabel["TelefoneValue"] = {name: data[2].value, disabled: true}; 314 } 309 315 $.contextMenu({ 310 316 selector: "#content_id_"+currentTab+" "+element+" .box-info", … … 312 318 delay:100, 313 319 autoHide:true, 314 items: { 315 "Name" : {name: "<b>"+data[0].value+"</b>", disabled: true} , 316 "Email" : {name: data[1].value, disabled: true}, 317 "TelefoneLabel" : {name: "<b>Telefone</b>", disabled: true}, 318 "TelefoneValue" : {name: data[2].value, disabled: true} 319 } 320 items: menuItensLabel 320 321 }); 321 322 } -
sandbox/2.4.1-3/expressoMail1_2/js/draw_api.js
r6422 r6460 9 9 */ 10 10 onceOpenedHeadersMessages = {}; 11 12 var dynamicPersonalContacts = new Array(); 13 var dynamicPersonalGroups = new Array(); 11 14 12 15 var openTab = { … … 3572 3575 input.keydown(function(e){ 3573 3576 f9 = false; 3574 var reEmail = /^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[_a-z0-9-]+(\.[_a-z0-9-]+)+$/;3575 var reEmail2 = /<([^<]*)>[\s]*$/;3576 3577 var focusing = input.parent().find(".email-text"); 3577 3578 //SE OS CONTATOS DINAMICOS ESTAO ATIVOS 3578 3579 if(parseInt(preferences.use_dynamic_contacts) && !input.hasClass("box-input")){ 3579 3580 //SELECIONA O CONTATO E EVITA OUTROS COMANDOS 3580 if ( e.keyCode === $.ui.keyCode.TAB && $( this ).data( " autocomplete" ).menu.active ) {3581 if ( e.keyCode === $.ui.keyCode.TAB && $( this ).data( "catcomplete" ).menu.active ) { 3581 3582 e.preventDefault(); 3582 3583 return false; … … 3584 3585 3585 3586 //FECHA OS CONTATOS DINÂMICOS 3586 if( (e.keyCode == 27) && $( this ).data( " autocomplete" ).menu.active ){3587 if( (e.keyCode == 27) && $( this ).data( "catcomplete" ).menu.active ){ 3587 3588 e.stopPropagation(); 3588 3589 e.preventDefault(); … … 3590 3591 3591 3592 //SELECIONA O CONTATO E EVITA OUTROS COMANDOS 3592 if(e.keyCode == $.ui.keyCode.ENTER && $( this ).data( " autocomplete" ).menu.active){3593 if(e.keyCode == $.ui.keyCode.ENTER && $( this ).data( "catcomplete" ).menu.active){ 3593 3594 e.preventDefault(); 3594 3595 return false; … … 3679 3680 3680 3681 input_search = $(input).val(); 3681 if($(input).val().length >= 4) 3682 $(input).val(""); 3682 $(input).val(""); 3683 3683 }) 3684 3684 //AO COLAR UM TEXTO NO CAMPO … … 3802 3802 box.find(".box-loading").removeClass("box-loading").addClass("box-info"); 3803 3803 box.addClass("box-"+value).removeClass("invalid-email-box"); 3804 loadExtraLDAPBox(data.collection. itens[0].data, ".box-"+value);3804 loadExtraLDAPBox(data.collection.data, ".box-"+value); 3805 3805 box.unbind("dblclick").bind("dblclick", function(e){ 3806 3806 new $.Zebra_Dialog('<strong>Impossivel editar</strong> um contato do catálogo pessoal\n' + … … 3811 3811 'auto_close': 3000 3812 3812 }); 3813 }).find(".box-input").val("\""+data.collection. itens[0].data[0].value+"\" <"+data.collection.itens[0].data[1].value+">");3814 box.find(".email-box-value").html( (data.collection. itens[0].data[0].value.length > 18 ? data.collection.itens[0].data[0].value.substring(0, 15)+"...": data.collection.itens[0].data[0].value))3813 }).find(".box-input").val("\""+data.collection.data[0].value+"\" <"+data.collection.data[1].value+">"); 3814 box.find(".email-box-value").html( (data.collection.data[0].value.length > 18 ? data.collection.data[0].value.substring(0, 15)+"...": data.collection.data[0].value)) 3815 3815 } 3816 3816 }else{ … … 3893 3893 //PREPARAÇÃO DA ARRAY DOS CONTATOS DINÂMICOS 3894 3894 var dynamicContactList = new Array(); 3895 var myArray = contacts.split(","); 3896 //Variavel de teste...Remover depois... 3897 var flag = true; 3898 for(var i in myArray){ 3899 var dynamicContact = myArray[i].split(";"); 3900 3901 /* if(dynamicContact.length > 1) 3902 dynamicContactList.push({name : dynamicContact[0], email: dynamicContact[1], value : (dynamicContact[0] +" - "+dynamicContact[1])}); 3903 else 3904 dynamicContactList.push({name : "", email: dynamicContact[0], value :dynamicContact[0]}); */ 3905 3906 //Verificar outro modo para criar a divisão dos contatos dinâmicos 3907 if( i <(myArray.length / 2)){ 3908 var type = 'recente'; 3909 3910 if(dynamicContact.length > 1) 3911 dynamicContactList.push({name : dynamicContact[0], email: dynamicContact[1], value : (dynamicContact[0] +" - "+dynamicContact[1]), type:type }); 3912 else 3913 dynamicContactList.push({name : "", email: dynamicContact[0], value :dynamicContact[0], type:type}); 3914 3915 }else{ 3916 var type = 'pessoal'; 3917 3918 if(flag){ 3919 dynamicContactList.push({name : "", email: "", value :"", type:"linha"}); 3920 flag = false; 3921 } 3922 3923 if(dynamicContact.length > 1) 3924 dynamicContactList.push({name : dynamicContact[0], email: dynamicContact[1], value : (dynamicContact[0] +" - "+dynamicContact[1]), type:type }); 3925 else 3926 dynamicContactList.push({name : "", email: dynamicContact[0], value :dynamicContact[0], type:type}); 3927 } 3928 } 3929 3895 var groupsData = DataLayer.read("/groups").collection.itens; 3896 var contactsData = DataLayer.read("/contacts").collection.itens; 3897 dynamicPersonalGroups = new Array(); 3898 3899 $.each(groupsData, function(index, value){ 3900 var group = { 3901 id : parseInt(value.data[0].value), 3902 name : value.data[2].value, 3903 email : value.data[2].value, 3904 value: value.data[2].value + " - " + value.data[2].value, 3905 type: "G" 3906 }; 3907 dynamicContactList.push(group); 3908 dynamicPersonalGroups.push(group); 3909 }); 3910 3911 dynamicPersonalContacts = new Array(); 3912 3913 $.each(contactsData, function(index, value){ 3914 var contact = { 3915 id : parseInt(value.data[0].value), 3916 name : value.data[1].value, 3917 email : value.data[2].value, 3918 value: value.data[1].value + " - " + value.data[2].value, 3919 type: "P" 3920 }; 3921 dynamicContactList.push(contact); 3922 dynamicPersonalGroups.push(contact); 3923 }); 3924 $.widget( "custom.catcomplete", $.ui.autocomplete, { 3925 _renderMenu: function( ul, items ) { 3926 var self = this, 3927 currentType = "G"; 3928 $.each( items, function( index, item ) { 3929 if ( item.type != currentType) { 3930 self._renderItem( ul, {name:"", value:"", type:"linha"} ); 3931 currentType = item.type; 3932 } 3933 self._renderItem( ul, item ); 3934 }); 3935 } 3936 }); 3930 3937 //INSERÇÃO DO AUTO COMPLETE AO INPUT 3931 div.find("input").autocomplete({ 3932 minLength: 0, 3933 source: function( request, response ) { 3934 response( $.ui.autocomplete.filter( 3935 dynamicContactList, extractLast( request.term ) ) ); 3936 }, 3938 div.find("input").catcomplete({ 3939 minLength: 1, 3940 source: dynamicContactList, 3937 3941 focus: function() { 3938 3942 return false; … … 3946 3950 return false; 3947 3951 }, 3948 autoFocus: true, 3949 open : function(){ 3950 if($.trim($(this).val()) == "") 3951 $(this).autocomplete( "close" ); 3952 } 3952 autoFocus: true 3953 3953 }) 3954 3954 3955 3955 //MONTAGEM DA LISTA DE CONTATOS DINÂMICOS DO AUTO COMPLETE 3956 .data( " autocomplete" )._renderItem = function( ul, item ) {3956 .data( "catcomplete" )._renderItem = function( ul, item ) { 3957 3957 ul.css({"min-width":"280px", "width":"50%", "max-height" : "180px", "overflow-y" : "auto"}); 3958 3958 if( $(ul).find("li").length > 10 ){ … … 3985 3985 //FUNÇÃO DOS BOTÕES PARA - CC - CCO 3986 3986 div.parents("tr:first").find("button").button().click(function(){ 3987 emQuickSearch(($(this).parents("tr:first").find("input").val() ? $(this).parents("tr:first").find("input").val() : input_search), "."+$(this).parents("tr:first").attr('class').split("-")[0], ID, undefined, true); 3987 if(!$(":focus").hasClass("new-message-input")) 3988 emQuickSearch(($(this).parents("tr:first").find("input").val() ? $(this).parents("tr:first").find("input").val() : input_search), "."+$(this).parents("tr:first").attr('class').split("-")[0], ID, undefined, true); 3988 3989 }); 3989 3990 } -
sandbox/2.4.1-3/prototype/rest/catalog/ContactResource.php
r6437 r6460 99 99 $d = new Data(); 100 100 $d->setName('email'); 101 $d->setValue($ value['email']);101 $d->setValue($contact[0]['email']); 102 102 $d->setPrompt('Email do Contato'); 103 103 $d->setDataType('string'); … … 110 110 $d = new Data(); 111 111 $d->setName('telephone'); 112 $d->setValue($ value['telephone']);112 $d->setValue($contact[0]['telephone']); 113 113 $d->setPrompt('Telefone do Contato'); 114 114 $d->setDataType('string'); -
sandbox/2.4.1-3/prototype/rest/user/UserResource.php
r6429 r6460 35 35 //Se nao foi encontrado usuario na consulta 36 36 if($user===false){ 37 $error = new Error();38 $error->setCode(Response::NOTFOUND);39 $error->setTitle('UserLDAP not found');40 $error->setDescription('User not found.');37 $error = new Error(); 38 $error->setCode(Response::NOTFOUND); 39 $error->setTitle('UserLDAP not found'); 40 $error->setDescription('User not found.'); 41 41 42 $c->setError($error);43 $h->setCollection($c);42 $c->setError($error); 43 $h->setCollection($c); 44 44 45 $response->code = Response::NOTFOUND;46 $response->body = $h->getHypermedia($request->accept[10][0]);47 return $response;45 $response->code = Response::NOTFOUND; 46 $response->body = $h->getHypermedia($request->accept[10][0]); 47 return $response; 48 48 } 49 49 50 foreach($user as $value){ 50 $t = new Template(); 51 51 $d = new Data(); 52 $i = new Item($request->resources, 'UserResource', $value['uid']);53 52 54 53 $d->setName('name'); 55 $d->setValue($value['name']);56 57 58 $d->setMaxLength('100');59 60 54 $d->setValue(null); 55 $d->setPrompt('Nome do Usuário'); 56 $d->setDataType('string'); 57 $d->setMaxLength(100); 58 $d->setMinLength(null); 59 $d->setRequired(true); 61 60 62 $i->addData($d); 61 $t->addData($d); 62 $d = new Data(); 63 64 $d->setName('email'); 65 $d->setValue(null); 66 $d->setPrompt('Email do Usuário'); 67 $d->setDataType('string'); 68 $d->setMaxLength(100); 69 $d->setMinLength(null); 70 $d->setRequired(true); 71 72 $t->addData($d); 63 73 64 74 $d = new Data(); 65 $d->setName('email');66 $d->setValue($value['mail']);67 $d->setPrompt('Emaildo Usuário');68 69 $d->setMaxLength('100');70 71 75 $d->setName('telefone'); 76 $d->setValue(null); 77 $d->setPrompt('Telefone do Usuário'); 78 $d->setDataType('string'); 79 $d->setMaxLength(100); 80 $d->setMinLength(null); 81 $d->setRequired(true); 72 82 73 $i->addData($d);83 $t->addData($d); 74 84 75 $d = new Data(); 76 $d->setName('telephoneNumber'); 77 $d->setValue($value['telephoneNumber']); 78 $d->setPrompt('Telefone do Usuário'); 79 $d->setDataType('string'); 80 $d->setMaxLength('100'); 81 $d->setMinLength(null); 82 $d->setRequired(true); 85 $c->setTemplate($t); 86 87 $d = new Data(); 88 $d->setName('name'); 89 $d->setValue($user[0]['name']); 90 $d->setPrompt('Nome do Usuário'); 91 $d->setDataType('string'); 92 $d->setMaxLength('100'); 93 $d->setMinLength(null); 94 $d->setRequired(true); 83 95 84 $i->addData($d); 96 $c->addData($d); 97 98 $d = new Data(); 99 $d->setName('email'); 100 $d->setValue($user[0]['mail']); 101 $d->setPrompt('Email do Usuário'); 102 $d->setDataType('string'); 103 $d->setMaxLength('100'); 104 $d->setMinLength(null); 105 $d->setRequired(true); 106 107 $c->addData($d); 108 109 $d = new Data(); 110 $d->setName('telephoneNumber'); 111 $d->setValue($user[0]['telephoneNumber']); 112 $d->setPrompt('Telefone do Usuário'); 113 $d->setDataType('string'); 114 $d->setMaxLength('100'); 115 $d->setMinLength(null); 116 $d->setRequired(true); 117 118 $c->addData($d); 119 120 $l = new Link(); 121 $l->setHref(''); 122 $l->setRel('delete'); 123 $l->setAlt('Remover'); 124 $l->setPrompt('Remover'); 125 $l->setRender('link'); 85 126 86 $l = new Link();127 $c->addLink($l); 87 128 88 $l->setHref(''); 89 $l->setRel('delete'); 90 $l->setAlt('Remover'); 91 $l->setPrompt('Remover'); 92 $l->setRender('link'); 129 $l = new Link(); 130 $l->setHref(''); 131 $l->setRel('put'); 132 $l->setAlt('Atualizar'); 133 $l->setPrompt('Atualizar'); 134 $l->setRender('link'); 93 135 94 $i->addLink($l);136 $c->addLink($l); 95 137 96 $l = new Link(); 97 $l->setHref(''); 98 $l->setRel('put'); 99 $l->setAlt('Atualizar'); 100 $l->setPrompt('Atualizar'); 101 $l->setRender('link'); 102 103 $i->addLink($l); 104 105 $l = new Link(); 106 $l->setHref($i->getHref()); 107 $l->setRel('get'); 108 $l->setAlt('Buscar'); 109 $l->setPrompt('Buscar'); 110 $l->setRender('link'); 111 112 $i->addLink($l); 113 $c->addItem($i); 114 } 115 116 $t = new Template(); 117 $d = new Data(); 118 119 $d->setName('name'); 120 $d->setValue(null); 121 $d->setPrompt('Nome do Usuário'); 122 $d->setDataType('string'); 123 $d->setMaxLength(100); 124 $d->setMinLength(null); 125 $d->setRequired(true); 126 127 $t->addData($d); 128 $d = new Data(); 129 130 $d->setName('email'); 131 $d->setValue(null); 132 $d->setPrompt('Email do Usuário'); 133 $d->setDataType('string'); 134 $d->setMaxLength(100); 135 $d->setMinLength(null); 136 $d->setRequired(true); 137 138 $t->addData($d); 139 140 $d = new Data(); 141 $d->setName('telefone'); 142 $d->setValue(null); 143 $d->setPrompt('Telefone do Usuário'); 144 $d->setDataType('string'); 145 $d->setMaxLength(100); 146 $d->setMinLength(null); 147 $d->setRequired(true); 148 149 $t->addData($d); 150 151 $c->setTemplate($t); 152 $d = new Data(); 153 154 $d->setName('Usuário LDAP'); 155 $d->setValue(null); 156 $d->setPrompt('Usuário do LDAP'); 157 $d->setDataType(null); 158 $d->setMaxLength(null); 159 $d->setMinLength(null); 160 $d->setRequired(null); 161 162 $c->addData($d); 163 164 $h->setCollection($c); 138 $h->setCollection($c); 165 139 166 140 }catch (Exception $ex){
Note: See TracChangeset
for help on using the changeset viewer.