Changeset 7410


Ignore:
Timestamp:
10/11/12 09:00:12 (7 years ago)
Author:
fernando
Message:

Ticket #3088 - adicionado link dinamico do MailArchive? Admin e corrigido bug da busca avançada por data

Location:
sandbox/2.5.0-expresso1
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • sandbox/2.5.0-expresso1/expressoMail1_2/js/MAQueryConfig.js

    r7343 r7410  
    286286  //window.alert('date_part = ' + date_time_picker[0] + '\ntime_part = ' + date_time_picker[1]); 
    287287 
    288   if ((this.validateDate(date_part)) && (this.validateTime(time_part))){ 
     288  if ((this.validateDate(date_part)) /*&& (this.validateTime(time_part))*/){ 
    289289    var date_split = date_part.split("/"); 
    290     var ddd = date_split[1]+'/'+date_split[0]+'/'+date_split[2] + ' ' + time_part; 
     290    var ddd = date_split[1]+'/'+date_split[0]+'/'+date_split[2] + ' ' + (time_part ? time_part : '00:00'); 
    291291    var ndate = new Date(ddd);    
    292292     
    293293    //window.alert('Date.parse (' + ddd + ') = ' + Date.parse(ndate)); 
    294     return(Date.parse(ndate)); 
     294    return Math.round(ndate.getTime());//(Date.parse()); 
    295295  } 
    296296  else 
  • sandbox/2.5.0-expresso1/prototype/modules/mail/js/foldertree.js

    r7340 r7410  
    77var cp_tree3; 
    88//Marcosw fim 
     9var mail_archive_url; 
    910function unorphanize(root, element) { 
    1011    var ok = false; 
     
    158159 
    159160    $("#content_folders").removeClass("menu-degrade").parent().removeClass("image-menu"); 
     161    mail_archive_url = mail_archive_protocol + "://" + mail_archive_host + ":" + mail_archive_port + "/admin"; 
    160162    var html = DataLayer.render('../prototype/modules/mail/templates/detailedfoldertree.ejs', {folders: [tree1, tree2, tree3]}); 
    161163    var folders_html = $("#content_folders").html(html).find(".mainfoldertree").treeview({ 
  • sandbox/2.5.0-expresso1/prototype/modules/mail/templates/detailedfoldertree.ejs

    r7351 r7410  
    6060                <span class="folder local-folder head_folder" style="display: inline;" title="MailArchive Desconectado">Pastas locais</span> 
    6161                <span class="local-connect" onclick="services_retry();" title="Conectar ao MailArchive"></span> 
    62                 <a class="local-admin" href="http://127.0.0.1:4333/admin" title="MailArchiver Admin" target="_blank"></a> 
     62                <a class="local-admin" href="<%= mail_archive_url %>" title="MailArchiver Admin" target="_blank"></a> 
    6363        </li> 
    6464        <%}%> 
Note: See TracChangeset for help on using the changeset viewer.