Changeset 7904 for sandbox/2.5.1-expresso1/prototype/modules/attach_message/attach_message.js

Timestamp:

02/21/13 16:31:23 (11 years ago)

Author:

thiago

Message:

Ticket #3349 - Listagem de mensagem considerando varias diretrizes.

File:

• sandbox/2.5.1-expresso1/prototype/modules/attach_message/attach_message.js (modified) (6 diffs)

sandbox/2.5.1-expresso1/prototype/modules/attach_message/attach_message.js

@@ -664 +664 @@
             if(preferences.use_local_messages != 0)
             {
+
+                folder = folder.split("_")[2];
+                folder = "messages_"+folder;
+
                 var local_folders   = [];
                 expresso_mail_archive.search_queryresult = null;
                 
                 local_folders.push(folder);
-        
-                expresso_mail_archive.search(local_folders, "##ALL <=>" + url_encode(param) + "##");
-                tmp = expresso_mail_archive.search_queryresult;
+
+                expresso_local_messages.setSortType('SORTDATE');
+                
+                tmp = [];
+
+                groupResult = [];
+                    expresso_mail_archive.search(local_folders, "SUBJECT " +  "<=>" +url_encode(param) + "##");
+                        groupResult.push( expresso_mail_archive.search_queryresult );
+                    expresso_mail_archive.search(local_folders, "FROM " + "<=>" + url_encode(param) + "##");
+                        groupResult.push( expresso_mail_archive.search_queryresult );
+                    expresso_mail_archive.search(local_folders, "TO " + "<=>" + url_encode(param) + "##");
+                        groupResult.push( expresso_mail_archive.search_queryresult );
+                    expresso_mail_archive.search(local_folders, "CC " + "<=>" + url_encode(param) + "##");
+                        groupResult.push( expresso_mail_archive.search_queryresult );
+                    
+                if($("#gbox_message_attacher_grid .attach-message-search-checkbox").is(":checked")){
+                    expresso_mail_archive.search(local_folders, "BODY " + "<=>" + url_encode(param) + "##");
+                        groupResult.push( expresso_mail_archive.search_queryresult );
+                }
+
+                
+                $.each(groupResult, function(i, result){
+                    if(result != null){
+                        $.each(result, function(i, each){
+                            tmp.push(each);
+                        });
+                    }
+                });
 
                 if(tmp == null)
@@ -679 +708 @@
 
                 msgs = [];
+
                 $.each(tmp, function(i, msg){
 
@@ -685 +715 @@
 
                     var message = {};
-                    
+
+                    var stamp =  msg['timestamp'];
+                    stamp = stamp.toString() + "000";
+                    stamp = parseInt(stamp);
+
                     message['msg_number'] = id;
                     message['flags'] = flag;
                     message['from.name'] = msg['from'];
                     message['subject'] = msg['subject'];
-                    message['timestamp'] = msg['timestamp'];
+                    message['timestamp'] = stamp;
                     message['size'] = msg['size'];
                     message['id'] = id;
@@ -724 +758 @@
 
             msgs = [];
-            console.log(tmp);
+
             $.each(tmp, function(i, msg){
                 flag = msg['flag'];
@@ -741 +775 @@
             });
 
-            console.log(msgs);
-
             return msgs;
         }
@@ -752 +784 @@
             if(folder.indexOf("local_messages_") == 0){
                 // Pesquisa pelas mensagens locais...
+                if(param == ""){
+                    $("#foldertree #"+folder).trigger("click");
+                    return;
+                }
                 msgs = search_local_messsages(param, folder);
             } else {