diff --git a/interface/web/mail/templates/mail_user_mailfilter_edit.htm b/interface/web/mail/templates/mail_user_mailfilter_edit.htm index 8d14eb4ee6fb73f5b515972c07c6a778278bcc8d..27d1d3ee46c0bfe0811961e82ac1e96dba9c5438 100644 --- a/interface/web/mail/templates/mail_user_mailfilter_edit.htm +++ b/interface/web/mail/templates/mail_user_mailfilter_edit.htm @@ -1,6 +1,6 @@
-
{tmpl_var name='move_junk'}
@@ -31,7 +31,7 @@
- + {tmpl_var name='filter_records'} diff --git a/interface/web/themes/default/assets/javascripts/ispconfig.js b/interface/web/themes/default/assets/javascripts/ispconfig.js index 54d5cd3c640059d4bb663882d63d8d75d0cc10b5..d909f38183e1e390051f469bc59f87cf9faf3307 100644 --- a/interface/web/themes/default/assets/javascripts/ispconfig.js +++ b/interface/web/themes/default/assets/javascripts/ispconfig.js @@ -112,7 +112,7 @@ var ISPConfig = { else return escapeMarkup(o.text); } }).on('change', function(e) { - if ($("#pageForm .table #Filter").length > 0) { + if ($("#pageForm .table #Filter").length > 0 && ! $(this).hasClass("disableChangeEvent")) { $("#pageForm .table #Filter").trigger('click'); } }); @@ -599,7 +599,7 @@ var ISPConfig = { $(document).on("change", function(event) { var elName = event.target.localName; - if ($("#pageForm .table #Filter").length > 0 && elName == 'select') { + if ($("#pageForm .table #Filter").length > 0 && elName == 'select' && ! $(event.target).hasClass("disableChangeEvent") ) { event.preventDefault(); $("#pageForm .table #Filter").trigger('click'); }