Changeset 7353 for sandbox

Timestamp:

10/05/12 15:03:08 (12 years ago)

Author:

fernando

Message:

Ticket #3088 - corrigido busca em todas as pastas (busca avançada)

Location:

sandbox/2.5.0-expresso1/expressoMail1_2/js

Files:

• mail_archiver.js (modified) (2 diffs)
• search.js (modified) (2 diffs)

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

@@ -1963 +1963 @@
         //window.alert('temos ' + expresso_mail_archive.search_message_list.length + ' mensagens de resultado da pesquisa mapeadas em memï¿œria');
     }
-    else{expresso_mail_archive.messageslisted =
-        expresso_mail_archive.queryresult = null;
+    else{
+        expresso_mail_archive.ServiceReturnObjectSearch = null;
+        expresso_mail_archive.search_queryresult        = null;
+        expresso_mail_archive.search_message_list       = null;
+        expresso_mail_archive.messageslisted            = null;
+        expresso_mail_archive.queryresult               = null;
     } 
     connector.hideProgressBar();
@@ -1971 +1975 @@
 MailArchiver.prototype.searchOperationFailure = function(){
     write_msg(get_lang('MailArchiver search operation fails', true));
+    expresso_mail_archive.ServiceReturnObjectSearch = null;
+    expresso_mail_archive.search_queryresult        = null;
+    expresso_mail_archive.search_message_list       = null;
+    expresso_mail_archive.messageslisted            = null;
+    expresso_mail_archive.queryresult               = null;
     connector.hideProgressBar();
 }

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

@@ -1271 +1271 @@
                 if(typeof(Data.data_gears)=="undefined")
                         EsearchE.show_paging( Data['num_msgs'] );
+
+                Data = null;
+                data = null;
         }
 
@@ -1507 +1510 @@
                         if (preferences.use_local_messages == 1)
                         {
-                                temp = expresso_local_messages.list_local_folders();
-                                for (var x in temp)
-                                {
-                                        local_folders.push(temp[x][0]);
-                                }
+                                local_folders[0] = ""; //se local_folders[0] estiver vazio, busca em todas as pastas
                         }
                 }