Changeset 6060

Timestamp:

04/27/12 13:36:40 (12 years ago)

Author:

marcieli

Message:

Ticket #2670 - Corrigido problema em setar flags respondida/encaminhada.

Location:

trunk

Files:

• expressoMail1_2/js/main.js (modified) (7 diffs)
• prototype/modules/mail/templates/new_message.ejs (modified) (1 diff)

trunk/expressoMail1_2/js/main.js

@@ -1621 +1621 @@
         }
         var content = $("#content_id_"+new_border_ID);
-        content.find('[name="msg_reply_from"]').val($("#msg_number_" + border_ID).val());
+
         
 switch(type){
@@ -1629 +1629 @@
                         title = "Re: " + data.subject;
                         content.find(".subject").val("Re: " + data.subject);                    
-                        useOriginalAttachments(new_border_ID,border_ID);                        
+                        useOriginalAttachments(new_border_ID,border_ID);
+                        content.find('[name="msg_reply_from"]').val($("#msg_number_" + border_ID).val());                       
 
                         // Insert the signature automaticaly at message body if use_signature preference is set
@@ -1642 +1643 @@
                         content.find(".subject").val("Re: " + data.subject);
                         content.find('[name="input_to"]').val(data.to);
+                        content.find('[name="msg_reply_from"]').val($("#msg_number_" + border_ID).val());       
 
                         block_quoted_body = make_body_reply(data.body, data.to, data.date_day, data.date_hour);
@@ -1660 +1662 @@
                         data.to_all = removeUserEmail(_array_to_all);
                         data.to_all = removeAlternative(data.to_all,_array_to_alternative);
+                        content.find('[name="msg_reply_from"]').val($("#msg_number_" + border_ID).val());       
 
                         data.to_all = data.to_all.join(",");
@@ -1702 +1705 @@
                         data.to_all = removeUserEmail(_array_to_all);
                         data.to_all = removeAlternative(data.to_all,_array_to_alternative);
+                        content.find('[name="msg_reply_from"]').val($("#msg_number_" + border_ID).val());
                 
                         if (data.to_all != get_lang("undisclosed-recipient"))
@@ -1748 +1752 @@
                         var divFiles = Element("divFiles_"+new_border_ID);
                         var campo_arquivo;
+                        content.find('[name="msg_forward_from"]').val($("#msg_number_" + border_ID).val());
                   
                         if (Element("attachments_" + border_ID))
@@ -2136 +2141 @@
         if(data && data.success == true ){
                 // if send ok, set a flag as answered or forwarded
-                var msg_number_replied = Element('msg_reply_from_'+ID);
-                var msg_number_forwarded = Element('msg_forward_from_'+ID);
-
-                if (msg_number_replied){
-                        proxy_mensagens.proxy_set_message_flag(msg_number_replied.value, 'answered');
-                }
-                else if (msg_number_forwarded){
-                        proxy_mensagens.proxy_set_message_flag(msg_number_forwarded.value, 'forwarded');
+                var msg_number_replied = $("#content_id_" + ID).find('[name="msg_reply_from"]');
+                var msg_number_forwarded = $("#content_id_" + ID).find('[name="msg_forward_from"]');
+
+                if (msg_number_replied.val()){
+                        proxy_mensagens.proxy_set_message_flag(msg_number_replied.val(), 'answered');
+                }
+                else if (msg_number_forwarded.val()){
+                        proxy_mensagens.proxy_set_message_flag(msg_number_forwarded.val(), 'forwarded');
                 }
                 if(expresso_offline){

trunk/prototype/modules/mail/templates/new_message.ejs

@@ -128 +128 @@
                 <input type="hidden" name="input_folder"/>
                 <input type="hidden" name="msg_reply_from"/>
+                <input type="hidden" name="msg_forward_from"/>
                 
         </form>