Changeset 6313 for sandbox/2.4.1-1/prototype

Timestamp:

05/25/12 14:58:54 (12 years ago)

Author:

marcieli

Message:

Ticket #2764 - Clicar em msg da listagem de alarmes remove a msg desta listagem.

Location:

sandbox/2.4.1-1/prototype/modules/mail

Files:

• js/followupflag.js (modified) (2 diffs)
• templates/followupflag_alarm_list.ejs (modified) (1 diff)

sandbox/2.4.1-1/prototype/modules/mail/js/followupflag.js

@@ -618 +618 @@
                                 alarmInRange : messages_alarm, 
                                 caption: caption, 
+                                type: it.attrDeadline
                         };
                         // tipo de modal a ser exibida
@@ -706 +707 @@
         cExecute ("$this.imap_functions.getFlaggedAlertMessages&folders="+fromRules, handlerMessageFilter);
 });
+

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

@@ -6 +6 @@
         <%
         for(var i=0; i<data.alarmInRange.length; i++){
-                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);";
+                //var teste = "";
+                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);";
+                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);";
         %>
                 <li class="message-item">