Changeset 5605

Timestamp:

03/02/12 09:04:43 (11 years ago)

Author:

marcieli

Message:

Ticket #2486 - corrigidos bugs referentes a atualizar sinalizador, sinalizar/marcar msgs.

Location:

trunk

Files:

• expressoMail1_2/inc/class.imap_functions.inc.php (modified) (2 diffs)
• expressoMail1_2/js/doiMenuData.js (modified) (3 diffs)
• expressoMail1_2/js/draw_api.js (modified) (1 diff)
• expressoMail1_2/js/search.js (modified) (1 diff)
• prototype/services/ImapServiceAdapter.php (modified) (1 diff)

trunk/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -226 +226 @@
                         $return['num_msgs'] = count($sort_array_msg)+($msg_range_begin-1);
                 }
+
                 return $return;
     }
@@ -4821 +4822 @@
                                         $labels = Controller::read( array( 'concept' => 'label', 'id' =>  $e['labelId']));     
                                         $return['msgs'][$i]['labels'][$e['labelId']] = $labels;
-                                }
-                                
+                                }       
                                 $return['msgs'][$i]['flag'] = ' ';
                                 $return['msgs'][$i]['flag'] .= $msg->Unseen ? $msg->Unseen : '';

trunk/expressoMail1_2/js/doiMenuData.js

@@ -83 +83 @@
                                                         ['=', 'messageNumber', messages[i].msg_number]
                                         ]);
-                                        if (!hasLabel) {
+                                        if (!hasLabel || hasLabel == "") {
                                                 lableleds.push(
                                                         DataLayer.put('labeled', {
@@ -196 +196 @@
         } else {
                 var labeleds = DataLayer.get('labeled', {
-                        criteria: {deepness: '2',
+                        criteria: {deepness: '2'},
                         filter: [
                                 'AND',
                                 ['=', 'folderName', msg_folder], 
                                 ['=', 'messageNumber', msg_number]
-                        ]}
+                        ]
                         
                 });
@@ -208 +208 @@
                                 menuItems[labeleds[i].label.id] = labeleds[i].label;
                 } else {
-                        $('#td_message_labels_' + msg_number +', #td_message_labels_search_' + msg_number+':first')
+                        $('#td_message_labels_' + msg_number +', tr[role="'+msg_number+'_'+msg_folder+'"] #td_message_labels_search_' + msg_number)
                         .html('');
                         //$.contextMenu( 'destroy', '#td_message_labels_' + msg_number +', #td_message_labels_search_' + msg_number+':first');

trunk/expressoMail1_2/js/draw_api.js

@@ -1671 +1671 @@
                                 * também para verificar se há ou não sinalizador nesta mensagem
                         */
+
+                        DataLayer.remove('followupflagged', false);
                         var flagged = DataLayer.get('followupflagged', {filter: [
                                 'AND', 

trunk/expressoMail1_2/js/search.js

@@ -541 +541 @@
                                 $(td).click(function(event, ui){        
                                         var messageClickedId = $(this).attr('id').match(/td_message_followup_search_([\d]+)/)[1];
+                                        /**TODO Alterar após melhorias no filtro da camada javascript*/
+                                        DataLayer.remove('followupflagged', false);
                                         var flagged = DataLayer.get('followupflagged', {filter: [
                                                 'AND', 

trunk/prototype/services/ImapServiceAdapter.php

@@ -475 +475 @@
                         {
                                 list($messageId, $followupflaggedId) = explode('#', $URI['id']);
+                                
                                 $folderName = basename($messageId);
                                 $messageNumber = dirname($messageId);