Changeset 7703 for trunk

Timestamp:

01/03/13 16:58:22 (11 years ago)

Author:

cristiano

Message:

Ticket #3262 - Inconsistencia na acao de responder automaticamente com uma mensagem nos filtros de mensagens

Location:

trunk

Files:

• INSTALL/arquivos/expresso.dump (modified) (1 diff)
• expressoMail1_2/setup/phpgw_pt-br.lang (modified) (1 diff)
• prototype/modules/filters/edit-filter.ejs (modified) (3 diffs)
• prototype/modules/filters/filters.js (modified) (1 diff)

trunk/INSTALL/arquivos/expresso.dump

@@ -17412 +17412 @@
 pt-br   expressoMail1_2 archive in folder       Arquivar na pasta
 pt-br   expressoMail1_2 move to trash   Mover para a Lixeira
-pt-br   expressoMail1_2 reply with a message automatically      Responder com uma mensagem automaticamente
+pt-br   expressoMail1_2 reject and automatically respond with the message       Rejeitar e responder automaticamente, com a mensagem
 pt-br   expressoMail1_2 type a reply message    Digite uma mensagem de resposta
 pt-br   expressoMail1_2 all messages will be answered automatically with the message indicated. Todas as mensagens serão respondidas automaticamente com a mensagem indicada.

trunk/expressoMail1_2/setup/phpgw_pt-br.lang

@@ -890 +890 @@
 Archive in folder       expressoMail1_2 pt-br   Arquivar na pasta
 Move to Trash   expressoMail1_2 pt-br   Mover para a Lixeira
-Reply with a message automatically      expressoMail1_2 pt-br   Responder com uma mensagem automaticamente
+Reject and automatically respond with the message       expressoMail1_2 pt-br   Rejeitar e responder automaticamente, com a mensagem
 Type a reply message    expressoMail1_2 pt-br   Digite uma mensagem de resposta
 All messages will be answered automatically with the message indicated. expressoMail1_2 pt-br   Todas as mensagens serão respondidas automaticamente com a mensagem indicada.

trunk/prototype/modules/filters/edit-filter.ejs

@@ -109 +109 @@
                         </ul>
                         <fieldset class="select-folderlist">
-                                <input type="radio" name="actionType[]" value="fileinto" checked="checked" onchange="$('.ui-widget-content :checkbox').parent().removeClass(' hidden');"/>
+                                <input type="radio" name="actionType[]" value="fileinto" checked="checked" onchange="$('.ui-widget-content .fileintoInbox').parent().removeClass(' hidden');"/>
                                 <label><%= get_lang("Archive in folder")%></label>
                                 <!-- 
@@ -132 +132 @@
                         </fieldset>
                         <fieldset>
-                                <input type="radio" name="actionType[]" value="redirect" onchange="$('.ui-widget-content :checkbox').parent().removeClass(' hidden');"/>
+                                <input type="radio" name="actionType[]" value="redirect" onchange="$('.ui-widget-content .fileintoInbox').parent().removeClass(' hidden');"/>
                                 <label><%= get_lang("Forward to the address")%></label>
                                 <input type="text" name="addressRedirect" />
                         </fieldset>
                         <fieldset>
-                                <input type="radio" name="actionType[]" value="setflag" onchange="$('.ui-widget-content :checkbox').parent().removeClass(' hidden');"/>
+                                <input type="radio" name="actionType[]" value="setflag" onchange="$('.ui-widget-content .fileintoInbox').parent().removeClass(' hidden');"/>
                                 <label><%= get_lang("Mark as")%></label>
                                 <!--
@@ -148 +148 @@
                         </fieldset>
                         <fieldset>
-                                <input type="radio" name="actionType[]" value="fileintoTrash" onchange="$('.ui-widget-content :checkbox').parent().removeClass(' hidden');"/>
+                                <input type="radio" name="actionType[]" value="fileintoTrash" onchange="$('.ui-widget-content .fileintoInbox').parent().removeClass(' hidden');"/>
                                 <label><%= get_lang("Trash")%></label>
                                 <input type="hidden" name="actionParameter[]" value="Trash"/>
                         </fieldset>
                         <fieldset class="fields-replyto">
-                                <input type="radio" name="actionType[]" value="reject" onchange="$('.ui-widget-content :checkbox').parent().addClass(' hidden');"/>
-                                <label><%= get_lang("Reply with a message automatically")%></label>
+                                <input type="radio" name="actionType[]" value="reject" onchange="$('.ui-widget-content .fileintoInbox').attr('checked', false).parent().addClass(' hidden');"/>
+                                <label><%= get_lang("Reject and automatically respond with the message")%></label>
                                 <textarea name="messageReject"></textarea>
                         </fieldset>

trunk/prototype/modules/filters/filters.js

@@ -244 +244 @@
                         actions.siblings('[name="addressRedirect"]').val(filter.actions[i].parameter);
                 if(filter.actions[i].type == "reject")
-                        actions.siblings('[name="messageReject"]').val(filter.actions[i].parameter);
+        {
+            actions.siblings('[name="messageReject"]').val(filter.actions[i].parameter);
+            $('.ui-widget-content .fileintoInbox ').attr('checked', false).parent().addClass(' hidden');
+        }
                 if((filter.actions[i].type == "fileinto" && first_fileinto_action) || filter.actions[i].type == "setflag"){
                         actions.parent().find('[value="'+filter.actions[i].parameter+'"]').attr("selected", "selected");