Changeset 7468 for trunk/expressoMail1_2/js/mail_archiver.js

Timestamp:

10/26/12 13:38:28 (12 years ago)

Author:

marcosw

Message:

Ticket #3088 - Correção para manter flags no desarquivamento em massa

File:

• trunk/expressoMail1_2/js/mail_archiver.js (modified) (9 diffs)

trunk/expressoMail1_2/js/mail_archiver.js

@@ -171 +171 @@
     this.selectedfolder = null;
     this.allmessagesbyfolder = new Array();
+    this.allcompletemessagesbyfolder = new Array();
     this.isArchiveOperation = false; //Se estiver em andamento uma operação de arquivamento/desarquivamento.
     //Contadores da aba de listagem de mensagem
@@ -644 +645 @@
         //Both XDomainRequest and XMLHttpRequest L2 supports onload event
         UnarchiveReqHandler.handler.onload = function(){            
-            for (var w=0; w < expresso_mail_archive.messageslisted.length; w++){
+            for (var w=0; w < expresso_mail_archive.allcompletemessagesbyfolder.length; w++){
                                 
-                if(expresso_mail_archive.messageslisted[w]["msg_number"] == expresso_mail_archive.message_list[expresso_mail_archive.unarchivecounter]){
-                    var timestamp = expresso_mail_archive.messageslisted[w]["timestamp"];
+                if(expresso_mail_archive.allcompletemessagesbyfolder[w]["msg_number"] == expresso_mail_archive.message_list[expresso_mail_archive.unarchivecounter]){
+                    var timestamp = expresso_mail_archive.allcompletemessagesbyfolder[w]["timestamp"];
                     
                     //Get local tagged message data
@@ -653 +654 @@
                     
                     //Forwarded is special one: marks as "answered" and "draft"
-                    if(expresso_mail_archive.messageslisted[w]["Forwarded"]){
-                        if(expresso_mail_archive.messageslisted[w]["Forwarded"] == 'F')
+                    if(expresso_mail_archive.allcompletemessagesbyfolder[w]["Forwarded"]){
+                        if(expresso_mail_archive.allcompletemessagesbyfolder[w]["Forwarded"] == 'F')
                             flags += 'A:X'+':';                                  
                     }
                     else{
                         //Answered tag
-                        if(expresso_mail_archive.messageslisted[w]["Answered"])
-                            if(expresso_mail_archive.messageslisted[w]["Answered"] == 'A')
+                        if(expresso_mail_archive.allcompletemessagesbyfolder[w]["Answered"])
+                            if(expresso_mail_archive.allcompletemessagesbyfolder[w]["Answered"] == 'A')
                                 flags += 'A'+':';
                             else
@@ -668 +669 @@
 
                         //Draft tag
-                        if(expresso_mail_archive.messageslisted[w]["Draft"])
-                            if(expresso_mail_archive.messageslisted[w]["Draft"] == 'X')
+                        if(expresso_mail_archive.allcompletemessagesbyfolder[w]["Draft"])
+                            if(expresso_mail_archive.allcompletemessagesbyfolder[w]["Draft"] == 'X')
                                 flags += 'D'+':';                    
                             else
@@ -678 +679 @@
                     
                     //Flagged tag
-                    if(expresso_mail_archive.messageslisted[w]["Flagged"])
-                        if(expresso_mail_archive.messageslisted[w]["Flagged"] == 'F')
+                    if(expresso_mail_archive.allcompletemessagesbyfolder[w]["Flagged"])
+                        if(expresso_mail_archive.allcompletemessagesbyfolder[w]["Flagged"] == 'F')
                             flags += 'F'+':';                                        
                         else
@@ -687 +688 @@
                     
                     //Unseen tag
-                    if(expresso_mail_archive.messageslisted[w]["Unseen"])
-                        if(expresso_mail_archive.messageslisted[w]["Unseen"] == 'U')
+                    if(expresso_mail_archive.allcompletemessagesbyfolder[w]["Unseen"])
+                        if(expresso_mail_archive.allcompletemessagesbyfolder[w]["Unseen"] == 'U')
                             flags += 'U';     
                         else
@@ -710 +711 @@
             "&flags="       + flags +
             "&id="          + id;
-
-            //Decrementa valor total de não lidas/total de mensagens na aba de listagem de mensagens
-            if(flags.indexOf("U") != -1){
-                expresso_mail_archive.tot_unseen_msgs_tab -= 1;
-                Element('new_m').innerHTML = '<font color="RED">'+expresso_mail_archive.tot_unseen_msgs_tab+'</font>';
-            }
-            expresso_mail_archive.tot_msgs_tab -= 1;
-            Element("tot_m").innerHTML = expresso_mail_archive.tot_msgs_tab; //folder_num_msgs;
 
             var handler_unarchive = function(data){
@@ -1411 +1404 @@
         else
             var query_messages = '{"query":{"folder":[{"@id":"'+folderid+'"}], "tags":[{"@contains":"'+searchType+'"}], "order":[{"@asc":"date"}]}}';
-        console.log(query_messages);
         ArchiveServices.listMessages(expresso_mail_archive.listAllMessagesByFolderOperationOK, expresso_mail_archive.listAllMessagesByFolderOperationFailure, expresso_mail_archive.session.id, query_messages);
     }
@@ -1422 +1414 @@
 MailArchiver.prototype.listAllMessagesByFolderOperationOK = function(returnService){
     var msglist = new Array();
+    var msglistcomplete = new Array();
     for(var i=0; i< returnService.getReturn().length; i++){
+        //Array montado apenas com ids para tratamento de seleção de mensagens independente de paginação
         msglist.push(returnService.getReturn()[i]._id);
+        //Incremento de contadores para atualização da aba de listagem
         if(returnService.getReturn()[i]._tags.indexOf("unseen") != -1){
             expresso_mail_archive.tot_unseen_msgs_tab++;
         }
         expresso_mail_archive.tot_msgs_tab++;
-        //console.log(returnService.getReturn()[i]);
-    }
-    //console.log(msglist);
+        //Array montado para operação de desarquivamento
+        var ExpSerialized = expresso_mail_archive.pattern.toExpressoHeader(returnService.getReturn()[i]);
+        msglistcomplete.push(connector.unserialize(ExpSerialized));
+    }
     expresso_mail_archive.allmessagesbyfolder = msglist;
+    expresso_mail_archive.allcompletemessagesbyfolder = msglistcomplete;
 }