Changeset 7708


Ignore:
Timestamp:
01/07/13 14:12:47 (8 years ago)
Author:
marcosw
Message:

Ticket #3266 - Correção para problema ao limpar pasta compartilhada lixeira ou spam

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/expressoMail1_2/js/main.js

    r7705 r7708  
    43944394                        } 
    43954395                        write_msg(get_lang('Your Trash folder was empty.')); 
    4396                         if (get_current_folder() == mount_url_folder(["INBOX",special_folders["Trash"]])){ 
     4396                        if (get_current_folder() == mount_url_folder(["INBOX",special_folders["Trash"]]) || get_current_folder() == mount_url_folder([folder,special_folders["Trash"]])){ 
    43974397                                draw_paging(0); 
    43984398                                remove_rows(document.getElementById("table_box"));                               
     
    44344434                if(!verify_session(data)) 
    44354435                        return; 
    4436                 if (get_current_folder() == mount_url_folder(["INBOX",special_folders["Spam"]])){ 
     4436                if (get_current_folder() == mount_url_folder(["INBOX",special_folders["Spam"]]) || get_current_folder() == mount_url_folder([folder,special_folders["Spam"]])){ 
    44374437                        draw_paging(0); 
    44384438                        remove_rows(document.getElementById("table_box")); 
  • trunk/prototype/modules/mail/templates/float_folder_menu.ejs

    r7414 r7708  
    5050                <%}%> 
    5151                <%if(data.name_folder == trashfolder && parseInt(data.acl.delete)){%> 
    52                         <span class="ui-icon ui-icon-trash float-menu-clean floating-default" onclick="empty_trash_imap(true, $(this));" title="<%=get_lang("Empty Trash")%>"></span>   
     52                        <span class="ui-icon ui-icon-trash float-menu-clean floating-default" onclick="empty_trash_imap(true, $(this),false);" title="<%=get_lang("Empty Trash")%>"></span>   
    5353                <%}else if(data.name_folder == spamfolder && parseInt(data.acl.delete)){%> 
    54                         <span class="ui-icon ui-icon-trash float-menu-clean floating-default" onclick="empty_spam_imap(true, $(this));" title="<%=get_lang("Empty Spam")%>"></span>   
     54                        <span class="ui-icon ui-icon-trash float-menu-clean floating-default" onclick="empty_spam_imap(true, $(this), false);" title="<%=get_lang("Empty Spam")%>"></span>   
    5555                <%}%> 
    5656        <%}%> 
Note: See TracChangeset for help on using the changeset viewer.