Changeset 6324 for sandbox

Timestamp:

05/28/12 09:31:46 (12 years ago)

Author:

marcieli

Message:

Ticket #2764 - Fechar alerta de filtro por remetente se não houver mais msgs alertadas nela.

Location:

sandbox/2.4.1-1

Files:

• expressoMail1_2/inc/class.imap_functions.inc.php (modified) (1 diff)
• prototype/modules/mail/templates/followupflag_alarm_list.ejs (modified) (1 diff)

sandbox/2.4.1-1/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -5316 +5316 @@
                 $message_number = $params['msg_number'];
                 $message_folder = $params['msg_folder'];
+                $alarm = $params['alarm'];
                 if ($message_folder && $message_number) {
                         $this->mbox = $this->open_mbox($message_folder);
                         imap_clearflag_full($this->mbox, $message_number, '$FilteredMessage', ST_UID);
                 }
-                $r = $this->get_info_msg(array('msg_number' => $message_number, 'msg_folder' =>urlencode($message_folder)));
+                $r = $this->get_info_msg(array('msg_number' => $message_number, 'msg_folder' =>urlencode($message_folder), 'alarm' => ($alarm)));
                 return $r;
         }

sandbox/2.4.1-1/prototype/modules/mail/templates/followupflag_alarm_list.ejs

@@ -7 +7 @@
         for(var i=0; i<data.alarmInRange.length; i++){
                 if(data.type == 'filtersDeadline')
-                        var openMessageScript = "$(this).parent().hide(); cExecute('$this.imap_functions.open_flagged_msg&msg_number="+data.alarmInRange[i].msg_number+"&msg_folder="+data.alarmInRange[i].msg_folder+"&alarm=true', show_msg);";
+                        var openMessageScript = "cExecute('$this.imap_functions.open_flagged_msg&msg_number="+data.alarmInRange[i].msg_number+"&msg_folder="+data.alarmInRange[i].msg_folder+"&alarm=true', show_msg); $(this).parent().remove(); if($('.filtersDeadline').find('.message-item').length == 0){ $('.filtersDeadline').remove(); } ";
                 else    
                         var openMessageScript = "cExecute('$this.imap_functions.get_info_msg&msg_number="+data.alarmInRange[i].msg_number+"&msg_folder="+data.alarmInRange[i].msg_folder+"&alarm=true', show_msg);";