Changeset 1000 for trunk/expressoMail1_2/js/main.js

Timestamp:

06/16/09 18:29:16 (15 years ago)

Author:

rafaelraymundo

Message:

Ticket #550 - Unificação de funcionalidade do SERPRO referentes ao arquivamento local.

File:

• trunk/expressoMail1_2/js/main.js (modified) (6 diffs)

trunk/expressoMail1_2/js/main.js

@@ -103 +103 @@
 }
 
-function show_msg_img(msg_info){
-       delete_border(msg_info.msg_number+"_r");
-       msg_info.showImg = true;
-       if (!Element(msg_info.msg_number)){
+function show_msg_img(msg_number,folder){
+    var call_back = function(data){
+       delete_border(data.msg_number+"_r");
+       data.showImg = true;
+       if (!Element(data.msg_number)){
                trElement = document.createElement('DIV');
-               trElement.id = msg_info.msg_number;
+               trElement.id = data.msg_number;
                Element("tbody_box").appendChild(trElement);
        }
-       show_msg(msg_info);
+       show_msg(data);
+    }
+
+    proxy_mensagens.msg_img(msg_number,folder,call_back);
+
 }
 
@@ -281 +286 @@
 }
 
-function delete_msgs(folder, msgs_number, border_ID, show_success_msg)
+function delete_msgs(folder, msgs_number, border_ID, show_success_msg,archive)
 {
         if (arguments.length < 4){
@@ -297 +302 @@
         }
 
-        if ((parseInt(preferences.save_deleted_msg)) && (folder!='INBOX'+cyrus_delimiter+trashfolder)){
+        if (!archive && (parseInt(preferences.save_deleted_msg)) && (folder!='INBOX'+cyrus_delimiter+trashfolder)){
                 move_msgs2(folder, msgs_number, border_ID, 'INBOX'+cyrus_delimiter+trashfolder,trashfolder,show_success_msg );
                 return;
@@ -595 +600 @@
                 var msgs_to_remove = new Array();
                 var update_tree;
-
                 for (var i = 0; i < data.length; i++) {
                         msg_info = connector.unserialize(data[i]);
+                        if ( folder == 'INBOX/Lixeira/tmpMoveToLocal' ){
+                                msg_info.msg_folder += (Date.parse(new Date));
+                        }
                         temp = expresso_local_messages.insert_mail(msg_info, msg_info['header'],msg_info['array_attach'],folder_dest );
                         if ( Element("check_box_message_" + msg_info.msg_number) )
@@ -609 +616 @@
                         if ( Element(msg_info.msg_number) )
                                 remove_className(Element(msg_info.msg_number), 'selected_msg');
+                       if ( tree_folders._selected.id.indexOf( 'local_' ) == 0 || folder.indexOf( 'INBOX/Lixeira/tmpMoveToLocal' ) == 0 )
+                        {
+                                openTab.imapBox[0] = '';
+                                tree_folders.getNodeById( 'local_Inbox' )._select( );
+                                change_folder('local_Inbox','Inbox')
+                        }
 
                 }
                 
                 if (preferences.keep_archived_messages == 0) { //Remove as mensagens
-                                delete_msgs(folder,msgs_to_remove,'null',false);
+                                delete_msgs(folder,msgs_to_remove,'null',false,true);
                 }
                 update_tree=(!has_local_messages_before) && expresso_local_messages.has_local_mails();
@@ -1915 +1928 @@
                 if(data == 'Post-Content-Length')
                         write_msg(get_lang('The size of this message has exceeded  the limit (%1B).',Element('upload_max_filesize').value));
-                else {
-                        write_msg(data);
-                        arrayJSWin["import_window"].close();
-                        if(openTab.imapBox[0] == wfolders_tree._selected.id){
-                                openTab.imapBox[0] = '';
-                                change_folder(wfolders_tree._selected.id, wfolders_tree._selected.caption);
-                        }
-                        else{
-                                refresh();
-                        }
-                }
-        }
+                else {  /*
+                        * @author Rommel Cysne (rommel.cysne@serpro.gov.br)
+                        * @date 2009/05/15
+                        * Foi colocado um teste para verificar se a pasta selecionada, passada como parametro,
+                        * eh uma pasta local (qualquer uma)
+                        */
+                        var er = /^local_/;
+                        if ( er.test(wfolders_tree._selected.id) )
+                        {
+                                archive_msgs('INBOX/Lixeira/tmpMoveToLocal',wfolders_tree._selected.id,data);
+                                cExecute('$this.imap_functions.delete_mailbox',function(){},'del_past=INBOX/Lixeira/tmpMoveToLocal');
+                        }
+                         else{
+                                write_msg(data);
+                                arrayJSWin["import_window"].close();
+                                if(openTab.imapBox[0] == wfolders_tree._selected.id)
+                                {
+                                        openTab.imapBox[0] = '';
+                                        change_folder(wfolders_tree._selected.id, wfolders_tree._selected.caption);
+                                } else{
+                                        refresh();
+                                }
+                        }
+        }
+    }
+
 }