Changeset 5708 for trunk/prototype/modules/mail

Timestamp:

03/12/12 18:58:19 (12 years ago)

Author:

marcieli

Message:

Ticket #2486 - Correcao de problemas em salvar followupflagged e adequacao de novos ids

Location:

trunk/prototype/modules/mail

Files:

• interceptors/Helpers.php (modified) (6 diffs)
• js/followupflag.js (modified) (3 diffs)

trunk/prototype/modules/mail/interceptors/Helpers.php

@@ -141 +141 @@
                         unset($criteria['filter']);
                 }
+                
+                /**
+                 * TODO - fazer parse do $criteria['filter'] para fazer strip no id composto
+                 */
         }
         
@@ -149 +153 @@
         //followupflagged:PostgreSQL.after.find
         public function doImapFind( &$uri , &$result , &$criteria , $original ){
+                /**
+                 * TODO - ver implicações de busca com id no filtro 
+                 */
 
                 if ($result) {
@@ -176 +183 @@
                         foreach($result as $r) {
                                 if ($r['id'] == $flagId) {
+                                        $r['id'] = $ir['id'];
                                         $r['messageNumber'] = $ir['messageNumber'];
                                         $r['folderName'] = $ir['folderName'];
@@ -199 +207 @@
                         //Se existe um sinalizador nesta mensagem, deleta-o
                         foreach ($imap_result as $r) {
+                                /**
+                                 * TODO - deletar sem id
+                                 */
+                                
                                 //deleta no Imap
                                 $toClearURI['id'] = $r['id'];
@@ -209 +221 @@
                         }
                 }
+
         }
 
@@ -219 +232 @@
 
         //followupflagged:PostgreSQL.after.create
-        public function doImapCreate( &$uri , &$result , &$criteria , $original ) {
-        
-                $imap_uri = $uri;
+        public function doImapCreate( &$uri , &$result , &$criteria , $original ) {     
+                /**
+                 * Se não consegue salvar no banco, ele retorna objeto válido, porém sem id
+                 */
+                if (!isset($result['id'])) return false;
+                
+                $imap_uri = $original['URI'];;
                 $imap_uri['service'] = 'Imap';
-                
-                $imap_params = $result + $original['properties'];
+
+                $imap_params = array_merge($original['properties'], $result);
+                
+                $result = array();
                 if ($imap_params['folderName'] && $imap_params['messageNumber'] && $imap_params['id']) {
-                        $imap_uri['id'] = $imap_params['folderName'] . '/' . $imap_params['messageNumber'] . '#' . $imap_params['id']; 
                         $imap_params['id'] = $imap_params['folderName'] . '/' . $imap_params['messageNumber'] . '#' . $imap_params['id']; 
                         $result = Controller::create($imap_uri, $imap_params);
                 }
-                
-        }
-        
-        //followupflagged:PostgreSQL.before.read
-        public function doImapRead( &$uri , &$params , &$criteria , $original ) {
-                $imap_uri = $uri;
+
+                if (!$result) {
+                        //TODO - rollback
+                }
+        }
+        
+        //followupflagged:PostgreSQL.after.read
+        public function doImapRead( &$uri , &$result , &$criteria , $original ) {
+                
+                $imap_uri = $original['URI'];
                 $imap_uri['service'] = 'Imap';
-                $result = Controller::read($imap_uri, $params, $criteria);
-                
-                return $result;
-        }       
-        
+
+                $imap_result = Controller::read($imap_uri, $params, $imap_criteria);
+                
+                if (!$imap_result)
+                        return false;           
+                
+                $result = array_merge($result, $imap_result);
+
+        }
+        
+        //followupflagged:PostgreSQL.before.<...>
+        public function stripURIAttrs( &$uri , &$params , &$criteria , $original ) {
+                list($messageId, $uri['id']) = explode('#', $uri['id']);
+        }
+
         //followupflagged:PostgreSQL.before.delete
         public function doImapDelete( &$uri , &$params , &$criteria , $original ) {
-
+        
                 $imap_uri = $uri;
                 $imap_uri['service'] = 'Imap';

trunk/prototype/modules/mail/js/followupflag.js

@@ -271 +271 @@
                 /** TODO Mudar quando melhorias forem implementadas na API de atualização do cache */
                 DataLayer.remove('followupflagged', false);
-                //DataLayer.get('followupflagged');
+                DataLayer.get('followupflagged');
                 var roles = get_selected_messages_search_role().split(',');
                 for (var i=0; i < selectedMessageIds.length; i++ ){
@@ -286 +286 @@
                                 if(onceOpenedHeadersMessages[folder_name][messageNumber]['followupflagged'].id){
                                         var flag_id = onceOpenedHeadersMessages[folder_name][messageNumber]['followupflagged'].id;
-                                        //DataLayer.remove('followupflagged', folder_name + '/' + messageNumber + '#' + flag_id );
+                                        DataLayer.remove('followupflagged', folder_name + '/' + messageNumber + '#' + flag_id );
                                         /**
                                          * TODO - corrigir o formato do ID no DataLayer, para que seja utilizado o ID composto
@@ -296 +296 @@
                                          * código abaixo pela chamada trivial de DataLayer.remove('followupflagged', idCompost)
                                          */
-                                        var data = {};
-                                        data[ 'followupflagged://' + folder_name + '/' + messageNumber + '#' + flag_id ] = false;
-                                        DataLayer.dispatch('Sync', data, false, true);
+                                        // var data = {};
+                                        // data[ 'followupflagged://' + folder_name + '/' + messageNumber + '#' + flag_id ] = false;
+                                        // DataLayer.dispatch('Sync', data, false, true);
                                         
                                         if(current_folder == folder_name){