Merge branch 'master' of github.com:ZoneMinder/zoneminder
commit
8f475faf12
|
@ -560,6 +560,9 @@ function submitTab(evt) {
|
||||||
function submitThisForm(param = null) {
|
function submitThisForm(param = null) {
|
||||||
var form = this.form;
|
var form = this.form;
|
||||||
var filter = null; // The filter that we previously moved to the left sidebar menu
|
var filter = null; // The filter that we previously moved to the left sidebar menu
|
||||||
|
if (!form && param && typeof param === 'object' && ('tagName' in param && param.tagName == 'FORM')) { // A form can be passed as a parameter.
|
||||||
|
form = param;
|
||||||
|
}
|
||||||
if (navbar_type == 'left' && !form) {
|
if (navbar_type == 'left' && !form) {
|
||||||
if (currentView == 'console') {
|
if (currentView == 'console') {
|
||||||
// We get the form that we process
|
// We get the form that we process
|
||||||
|
@ -1962,7 +1965,7 @@ function resetSelectElement(el) {
|
||||||
if (currentView == 'events') {
|
if (currentView == 'events') {
|
||||||
filterEvents(clickedElement = selectElement);
|
filterEvents(clickedElement = selectElement);
|
||||||
} else {
|
} else {
|
||||||
submitThisForm();
|
submitThisForm(this.closest('form'));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue