Changeset 6824 for branches/2.4/prototype
- Timestamp:
- 07/19/12 17:07:48 (12 years ago)
- Location:
- branches/2.4/prototype/modules/filters
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.4/prototype/modules/filters/edit-filter.ejs
r6754 r6824 82 82 <input type="hidden" name="criteriaType[]" value="hasAttachment"/> 83 83 <label><%= get_lang("The message has attachment")%></label> 84 </fieldset> 85 <fieldset> 86 <input type="checkbox" name="verifyNextRule" value="verifyNextRule" class="verifyNextRule"/> 87 <label><%= get_lang("Continue checking other rules if the criteria is met?")%></label> 84 88 </fieldset> 85 89 <fieldset class="fields-isexact"> -
branches/2.4/prototype/modules/filters/filters.js
r6754 r6824 232 232 233 233 if (filter.alertMessage == 'true') $('.alertMessage').attr('checked', 'True'); 234 if (filter.verifyNextRule == 'true') $('.verifyNextRule').attr('checked', 'True'); 234 235 } 235 236 … … 308 309 enabled : true, 309 310 alertMessage: $('.alertMessage').is(':checked'), 311 verifyNextRule: $('.verifyNextRule').is(':checked'), 310 312 //applyMessages: allMessages? !$.isEmptyObject( selectedMessages ) ? 311 313 //keys( selectedMessages ) : allMessages : "" 312 314 applyMessages: apply_messages_ 313 //applyMessages: ""314 315 }; 315 316 }, -
branches/2.4/prototype/modules/filters/interceptors/FilterMapping.php
r6771 r6824 122 122 $action = $data['actions']; 123 123 124 ($i >0 ) ? $script_match = 'els' : $script_match = '';124 ($i >0 && $verifyNextRule == 'false') ? $script_match = 'els' : $script_match = ''; 125 125 $data['isExact'] == 'false' ? $script_match .= 'if anyof (' : $script_match .= 'if allof ('; 126 127 $verifyNextRule = 'false'; 126 128 127 129 if( is_array($criteria) ) … … 275 277 $script_criteria = ""; 276 278 $script_action = ""; 277 $data['applyMessages'] = ""; 279 $data['applyMessages'] = ""; 280 281 $verifyNextRule = $data['verifyNextRule']; 278 282 } 279 283
Note: See TracChangeset
for help on using the changeset viewer.