Changeset 4770 for branches/2.2.0.1

Timestamp:

07/15/11 15:23:09 (13 years ago)

Author:

rafaelraymundo

Message:

Ticket #2084 - Filtros Encadeados .......................

File:

• branches/2.2.0.1/expressoMail1_2/js/filter.js (modified) (3 diffs)

branches/2.2.0.1/expressoMail1_2/js/filter.js

@@ -217 +217 @@
                         var mark_values = this.values[fields[8]].split(",");
                         for(var i=0; i < mark_values.length; i++){
-                                if( mark_values[i] == "checkBox2"){
+                                if( mark_values[i] == "checkBox1" || mark_values[i] == "checkBox2"){
                                         document.getElementById(mark_values[i]).checked = true;
                                 }
@@ -320 +320 @@
                                                 "</tr><tr><td colspan='2'><hr size='1' width='100%'><b>"+get_lang("Action")+":</b></td></tr>"+
                                                 "</table><table id='table_rule1' border='0' cellpading='0' cellspacing='0' width='100%'>"+
-                                                 "<tr><td colspan='2'><input type='checkBox' id='checkBox2' onclick='filter.disable_radio();' name='checkb'>"+get_lang('Keep a copy of the message at your Inbox')+ "</td><tr>"+
-                                                 "<tr><td width='50%'><input type='radio' id='radio1' name='radio' value='folder'>"+get_lang('Store at')+".:</td>"+
+                                                "<tr><td colspan='2'><input type='checkBox' id='checkBox1' name='checkb'>"+get_lang('Also check message against next rule') + "</td></tr>"+
+                                                "<tr><td colspan='2'><input type='checkBox' id='checkBox2' onclick='filter.disable_radio();' name='checkb'>"+get_lang('Keep a copy of the message at your Inbox')+ "</td><tr>"+
+                                                "<tr><td width='50%'><input type='radio' id='radio1' name='radio' value='folder'>"+get_lang('Store at')+".:</td>"+
                                                 "<td width='50%'><select id='select_mailboxes' name='select_mailboxes'></select></td>"+
                                                 "</tr><tr><td width='50%'><input type='radio' id='radio2' name='radio' value='address'>"+get_lang('Forward to the address')+".:</td>"+
@@ -645 +646 @@
                         }
                         var opts = "";
+                        if(Element("checkBox1").checked == true){
+                            opts += ",checkBox1";
+                        }
                         if(Element("checkBox2").checked == true){
                             opts += ",checkBox2";