Changeset 7149 for sandbox/2.5.0-expresso1/expressoMail1_2/js/main.js

Timestamp:

09/03/12 17:17:31 (12 years ago)

Author:

marcosw

Message:

Ticket #3088 - Melhoria para mover e remover mensagens locais

File:

• sandbox/2.5.0-expresso1/expressoMail1_2/js/main.js (modified) (1 diff)

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

@@ -1378 +1378 @@
         }
         refresh();
-        if (parseInt(msgs_number) > 0 || msgs_number.length > 0){
-                // remove a flag $FilteredMessage da mensagem, depois move
-                var handler_removeFlag = function(){
-                        $.ajax({
-                                url: 'controller.php?' + $.param( {action: '$this.imap_functions.move_messages',
-                                                                    folder: folder,
-                                                                    msgs_number: ""+msgs_number,
-                                                                    border_ID: border_ID,
-                                                                    sort_box_type: sort_box_type,
-                                                                    search_box_type: search_box_type,
-                                                                    sort_box_reverse: sort_box_reverse,
-                                                                    reuse_border: border_ID,
-                                                                    new_folder: new_folder,
-                                                                    new_folder_name: new_folder_name,
-                                                                    get_previous_msg: ( !not_opem_previus ? preferences.delete_and_show_previous_message : false ),
-                                                                    decoded: true } ),
-
-                                success: function( data ){
-                                    data = connector.unserialize( data );
-                                    $.each(msgs_number, function(index, value){
-                                        delete selectedPagingMsgs[value];
+        
+        //*** MARCOSW INICIO ***
+        if (proxy_mensagens.is_local_folder(folder)){
+                expresso_mail_archive.update_counters = true;
+        //Folder de onde sai a mensagem é local (armazenamento local)
+
+        if(msgs_number=='selected'){
+            msgs_number = get_selected_messages();
+        }
+
+        if (new_folder == 'local_root'){
+            alert(get_lang("Select a folder!"));
+        }
+                    
+        if (parseInt(msgs_number) > 0 || msgs_number.length > 0) {
+            if (proxy_mensagens.is_local_folder(new_folder)){
+                //esta tirando de um folder local para outro folder local
+                //expresso_mail_archive.moveMessages(new_folder.substr(6), msgs_number);
+                expresso_mail_archive.moveMessages(new_folder.replace('local_messages_', ''), msgs_number);
+            }
+            else{
+                //esta tirando de um folder local para um folder IMAP (desarquivamento)
+                if(!new_folder){
+                    new_folder = 'INBOX';
+                }
+                if(currentTab.toString().indexOf("_r") != -1){
+                    msgs_number = currentTab.toString().substr(0,currentTab.toString().indexOf("_r"));
+                }                      
+                expresso_mail_archive.unarchieve(folder, new_folder, msgs_number);
+            }
+        }
+        else{
+            write_msg(get_lang('No selected message.'));
+        }
+        }
+        else{
+        if (proxy_mensagens.is_local_folder(new_folder)){
+            //esta tirando de um folder não local para um folder local (arquivamento)
+            if(msgs_number=='selected'){
+                archive_msgs(folder, new_folder);
+            }
+            else{
+                archive_msgs(folder, new_folder, msgs_number);
+            }
+        }
+        else{
+            //esta tirando de um folder não local para outro folder não local (move)
+        //*** MARCOSW FIM ***
+            //move_msgs(folder, msgs_number, border_ID, new_folder, new_folder_name);
+                        if (parseInt(msgs_number) > 0 || msgs_number.length > 0){
+                                // remove a flag $FilteredMessage da mensagem, depois move
+                                var handler_removeFlag = function(){
+                                        $.ajax({
+                                                url: 'controller.php?' + $.param( {action: '$this.imap_functions.move_messages',
+                                                                                    folder: folder,
+                                                                                    msgs_number: ""+msgs_number,
+                                                                                    border_ID: border_ID,
+                                                                                    sort_box_type: sort_box_type,
+                                                                                    search_box_type: search_box_type,
+                                                                                    sort_box_reverse: sort_box_reverse,
+                                                                                    reuse_border: border_ID,
+                                                                                    new_folder: new_folder,
+                                                                                    new_folder_name: new_folder_name,
+                                                                                    get_previous_msg: ( !not_opem_previus ? preferences.delete_and_show_previous_message : false ),
+                                                                                    decoded: true } ),
+
+                                                success: function( data ){
+                                                    data = connector.unserialize( data );
+                                                    $.each(msgs_number, function(index, value){
+                                                        delete selectedPagingMsgs[value];
+                                                    });
+                                                    totalFolderMsgs -= msgs_number.split(",").length;
+
+                                                    //TESTE
+                                                    selectAllFolderMsgs();
+                                                $('.select-link').unbind('click');
+
+                                                    if( data )
+                                                        handler_move_msgs( data );
+                                                },
+                                                beforeSend: function( jqXHR, settings ){
+                                                        connector.showProgressBar();
+                                            },
+                                            complete: function( jqXHR, settings ){
+                                                        connector.hideProgressBar();
+                                          }
+
                                     });
-                                    totalFolderMsgs -= msgs_number.split(",").length;
-
-                                    //TESTE
-                                    selectAllFolderMsgs();
-                                $('.select-link').unbind('click');
-
-                                    if( data )
-                                        handler_move_msgs( data );
-                                },
-                                beforeSend: function( jqXHR, settings ){
-                                        connector.showProgressBar();
-                            },
-                            complete: function( jqXHR, settings ){
-                                        connector.hideProgressBar();
-                          }
-
-                    });
-                }
-                var hasFolder = false;
-                $.each(fromRules, function(index, value) {
-                        if(value == folder){
-                                hasFolder = true;
-                                cExecute ("$this.imap_functions.removeFlagMessagesFilter&folder="+folder+"&msg_number="+msgs_number, handler_removeFlag); 
-                                return false;
-                        }
-                });
-                if(!hasFolder){
-                        handler_removeFlag();
-                }
-                
-        }else
-                write_msg(get_lang('No selected message.'));
+                                }
+                                var hasFolder = false;
+                                $.each(fromRules, function(index, value) {
+                                        if(value == folder){
+                                                hasFolder = true;
+                                                cExecute ("$this.imap_functions.removeFlagMessagesFilter&folder="+folder+"&msg_number="+msgs_number, handler_removeFlag); 
+                                                return false;
+                                        }
+                                });
+                                if(!hasFolder){
+                                        handler_removeFlag();
+                                }
+                                
+                        }else
+                                write_msg(get_lang('No selected message.'));
+    //*** MARCOSW INICIO ***
+        }
+    }   
+    //Marcosw fim
+        
 }