Changeset 7234 for sandbox/2.5.0-expresso1

Timestamp:

09/18/12 11:31:47 (12 years ago)

Author:

thiago

Message:

Ticket #3088 - Implementado a funcionalidade de excluir todas as mensagens na spam e trash

Location:

sandbox/2.5.0-expresso1

Files:

• expressoMail1_2/js/mail_archiver.js (modified) (1 diff)
• expressoMail1_2/js/main.js (modified) (4 diffs)
• prototype/modules/mail/templates/float_folder_menu.ejs (modified) (1 diff)

sandbox/2.5.0-expresso1/expressoMail1_2/js/mail_archiver.js

@@ -1350 +1350 @@
 }
 
+
+/**
+ *delete All Messages
+ *
+ *@author Thiago Rossetto Afonso [thiago@prognus.com.br]
+ *
+ *@param folderId - folder id to get all messages that it has
+ */
+
+MailArchiver.prototype.deleteAllMessages = function(folderId){
+    try{
+        var objfolder = new Object();
+        objfolder.folder = folderId;
+
+        var query_data = expresso_mail_archive.queryconfig.query(objfolder);
+
+        ArchiveServices.listMessages(expresso_mail_archive.deleteMsgsOperationOK, expresso_mail_archive.deleteMsgsOperationFailure, expresso_mail_archive.session.id, query_data);
+    }catch(e){
+        expresso_mail_archive.getFaultInfo();
+    }
+}
+MailArchiver.prototype.deleteMsgsOperationOK = function(returnService){
+    var msgsArray = new Array();
+    var msgs = "";
+    for(var i=0; i< returnService.getReturn().length; i++){
+        msgsArray.push(returnService.getReturn()[i]._id);    
+    }  
+    msgs = msgsArray.join(",");
+
+    MailArchiver.prototype.deleteMessages(msgs);
+}
+MailArchiver.prototype.deleteMsgsOperationFailure = function(){
+    alert("Your Messages weren't deleted.");
+}
+
+
+
 //listMessages operation
 //OLD local_messages.prototype.get_local_range_msgs = function(folder,msg_range_begin,emails_per_page,sort,sort_reverse,search,preview_msg_subject,preview_msg_tip) {

sandbox/2.5.0-expresso1/expressoMail1_2/js/main.js

@@ -3771 +3771 @@
 }
 
-function empty_trash_imap(shared, button){
+function empty_trash_imap(shared, button, type){
         if(shared){
                 var folder_part = $(button).parents("li:first").attr("id").split(cyrus_delimiter);
@@ -3811 +3811 @@
                 'overlay_opacity' : 0.5,
                 'onClose':  function(caption) {
+
                         if(caption == get_lang("Yes")){
-                                cExecute ("$this.imap_functions.empty_folder&clean_folder="+"imapDefaultTrashFolder"+(shared ? "&shared="+folder : ""), handler_empty_trash);
+                if(type.id == "local_messages_trash"){
+                    expresso_mail_archive.deleteAllMessages(type.id);
+                    cExecute("$this.imap_functions.get_folders_list&onload=true", update_menu);
+                } else {
+                    cExecute ("$this.imap_functions.empty_folder&clean_folder="+"imapDefaultTrashFolder"+(shared ? "&shared="+folder : ""), handler_empty_trash);
+                } 
                         }
                 }
@@ -3818 +3824 @@
 }
 
-function empty_spam_imap(shared, button){
+function empty_spam_imap(shared, button, type){
         if(shared){
                 var folder_part = $(button).parents("li:first").attr("id").split(cyrus_delimiter);
@@ -3859 +3865 @@
                 'onClose':  function(caption) {
                         if(caption == get_lang("Yes")){
-                                cExecute ("$this.imap_functions.empty_folder&clean_folder="+"imapDefaultSpamFolder"+(shared ? "&shared="+folder : ""), handler_empty_spam);
+                if(type.id == "local_messages_spam"){ 
+                    expresso_mail_archive.deleteAllMessages(type.id);
+                    cExecute("$this.imap_functions.get_folders_list&onload=true", update_menu);
+                } else {
+                    cExecute ("$this.imap_functions.empty_folder&clean_folder="+"imapDefaultSpamFolder"+(shared ? "&shared="+folder : ""), handler_empty_spam);
+                } 
                         }
                 }

sandbox/2.5.0-expresso1/prototype/modules/mail/templates/float_folder_menu.ejs

@@ -29 +29 @@
                 <%} 
                 else if(data.name_folder == trashfolder || data.name_folder == "local_messages_trash"){%>
-                        <span class="ui-icon ui-icon-trash float-menu-clean floating-default" onclick="empty_trash_imap();" title="<%=get_lang("Empty Trash")%>"></span>  
+         <% var type = false; if(data.name_folder == "local_messages_trash"){ type = data.name_folder; } else { type = false; } %>
+                        <span class="ui-icon ui-icon-trash float-menu-clean floating-default" onclick="empty_trash_imap(false, false, <%= type %>);" title="<%=get_lang("Empty Trash")%>"></span>  
                 <%}
                 else if(data.name_folder == spamfolder || data.name_folder == "local_messages_spam"){%>
-        
-                        <span class="ui-icon ui-icon-trash float-menu-clean floating-default" onclick="empty_spam_imap();" title="<%=get_lang("Empty Spam")%>"></span>  
+            <% var type = false; if(data.name_folder == "local_messages_spam"){ type = data.name_folder; } else { type = false; } %>
+                        <span class="ui-icon ui-icon-trash float-menu-clean floating-default" onclick="empty_spam_imap(false, false, <%= type %>);" title="<%=get_lang("Empty Spam")%>"></span>  
                         
                 <%}%>