Changeset 6630

Timestamp:

06/26/12 10:53:11 (11 years ago)

Author:

eduardow

Message:

Ticket #2884 - Inconsistência ao remover marcadores.

Location:

branches/2.4/prototype

Files:

• modules/mail/interceptors/Helpers.php (modified) (1 diff)
• modules/mail/js/label.js (modified) (3 diffs)
• services/ImapServiceAdapter.php (modified) (1 diff)

branches/2.4/prototype/modules/mail/interceptors/Helpers.php

@@ -42 +42 @@
                 }
                 
-                Controller::delete( array( 'concept' => 'labeled' ), false, array( 'filter' => array( 'IN', 'id', $labeledsIds )) );
+                Controller::delete( array( 'concept' => 'labeled', 'service' => 'Imap' ), false, array( 'filter' => array( 'IN', 'id', $labeledsIds )) );
 
                 //return $result;

branches/2.4/prototype/modules/mail/js/label.js

@@ -83 +83 @@
 }
 
-function updateMessageLabels(idLabel){
-        var msgsReference = DataLayer.get('labeled', {filter: ['=', 'labelId', ''+idLabel]}, true);
+function updateMessageLabels(msgsReference){
         for(var i = 0; i < msgsReference.length; i++){
                 updateLabelsColumn({msg_number: msgsReference[i].messageNumber, boxname: msgsReference[i].folderName});
@@ -170 +169 @@
                                                 
                                                 draw_tree_labels();
-                                                updateMessageLabels(labelEdited.id);
+                                                var msgsReference = DataLayer.get('labeled', {filter: ['=', 'labelId', ''+labelEdited.id]}, true); 
+                                                updateMessageLabels(msgsReference);
                                 
                                                 /**
@@ -206 +206 @@
                 }
         });
+        
+        var msgsReference = DataLayer.get('labeled', {filter: ['=', 'labelId', ''+id]}, true);
                 
         DataLayer.remove('label', id);
+        
         DataLayer.commit(false, false, function(data){
                 $.contextMenu( 'destroy', ".table_box tbody tr");
                 loadMenu();
-                updateMessageLabels(id);                
+                updateMessageLabels(msgsReference);             
         });
         winElement.find(".label-list li:first").trigger("click");

branches/2.4/prototype/services/ImapServiceAdapter.php

@@ -776 +776 @@
     public function deleteAll( $URI, $justthese = false, $criteria = false )
     {
+                $op = $criteria['filter'][0]; 
+                $ids = $criteria['filter'][2]; 
+                if($op == 'IN'){ 
+                        foreach ($ids as $id){ 
+                                self::delete( array( 'concept' => $URI['concept'], 'id' => $id), false, false); 
+                        } 
+                }
+                
                 /**
                  * TODO - implementar a deleção de todos os followupflaggeds conforme filtro