ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add special handling for skip_locked, as it is a checkbox. Don't update REQUEST['Id'] on execute so we can redirect to the original filter.

This commit is contained in:
Isaac Connor 2022-02-03 17:31:37 -05:00
parent a6dc7ba0fc
commit b3092f2f59
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
web/includes/actions/filter.php
View File

@ -48,6 +48,7 @@ if (isset($_REQUEST['object']) and ($_REQUEST['object'] == 'filter')) {
$_REQUEST['filter']['Query']['sort_field'] = validStr($_REQUEST['filter']['Query']['sort_field']); $_REQUEST['filter']['Query']['sort_field'] = validStr($_REQUEST['filter']['Query']['sort_field']);
$_REQUEST['filter']['Query']['sort_asc'] = validStr($_REQUEST['filter']['Query']['sort_asc']); $_REQUEST['filter']['Query']['sort_asc'] = validStr($_REQUEST['filter']['Query']['sort_asc']);
$_REQUEST['filter']['Query']['limit'] = validInt($_REQUEST['filter']['Query']['limit']); $_REQUEST['filter']['Query']['limit'] = validInt($_REQUEST['filter']['Query']['limit']);
$_REQUEST['filter']['Query']['skip_locked'] = isset($_REQUEST['filter']['Query']['skip_locked']) ? validInt($_REQUEST['filter']['Query']['skip_locked']) : 0;
$_REQUEST['filter']['AutoCopy'] = empty($_REQUEST['filter']['AutoCopy']) ? 0 : 1; $_REQUEST['filter']['AutoCopy'] = empty($_REQUEST['filter']['AutoCopy']) ? 0 : 1;
$_REQUEST['filter']['AutoCopyTo'] = empty($_REQUEST['filter']['AutoCopyTo']) ? 0 : $_REQUEST['filter']['AutoCopyTo']; $_REQUEST['filter']['AutoCopyTo'] = empty($_REQUEST['filter']['AutoCopyTo']) ? 0 : $_REQUEST['filter']['AutoCopyTo'];
@ -80,21 +81,23 @@ if (isset($_REQUEST['object']) and ($_REQUEST['object'] == 'filter')) {
$error_message = $filter->get_last_error(); $error_message = $filter->get_last_error();
return; return;
} }
if ($action == 'Save' or $action == 'SaveAs' ) {
// We update the request id so that the newly saved filter is auto-selected // We update the request id so that the newly saved filter is auto-selected
$_REQUEST['Id'] = $filter->Id(); $_REQUEST['Id'] = $filter->Id();
}
} # end if changes } # end if changes
if ($action == 'execute') { if ($action == 'execute') {
$filter->execute(); $filter->execute();
if (count($changes)) { if (count($changes)) {
$filter->delete(); $filter->delete();
$filter->Id(null); $filter->Id($_REQUEST['Id']);
} }
} else if ($filter->Background()) { } else if ($filter->Background()) {
$filter->control('start'); $filter->control('start');
} }
global $redirect; global $redirect;
$redirect = '?view=filter'.$filter->querystring('filter', '&'); $redirect = '?view=filter&Id='.$_REQUEST['Id'].$filter->querystring('filter', '&');
} else if ($action == 'control') { } else if ($action == 'control') {
if ( $_REQUEST['command'] == 'start' if ( $_REQUEST['command'] == 'start'