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

Merge branch 'master' of github.com:ZoneMinder/zoneminder

This commit is contained in:
Isaac Connor 2020-11-03 12:11:58 -05:00
parent 903c6a2d5a 6112db627c
commit 2c899bd3c5
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/includes/Filter.php
View File

@ -60,7 +60,7 @@ class Filter extends ZM_Object {
$this->_querystring .= $term->querystring($objectname, $separator); $this->_querystring .= $term->querystring($objectname, $separator);
} # end foreach term } # end foreach term
if ( $this->Id() ) { if ( $this->Id() ) {
$this->_querystring .= $separator.$objectname.'[Id]='.$this->Id(); $this->_querystring .= $separator.$objectname.urlencode('[Id]=').$this->Id();
} }
} }
return $this->_querystring; return $this->_querystring;

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

@ -95,7 +95,7 @@ if ( isset($_REQUEST['object']) and ( $_REQUEST['object'] == 'filter' ) ) {
} else if ( $filter->Background() ) { } else if ( $filter->Background() ) {
$filter->control('start'); $filter->control('start');
} }
$redirect = '?view=filter&Id='.$filter->Id(); $redirect = '?view=filter'.$filter->querystring();
} else if ( $action == 'control' ) { } else if ( $action == 'control' ) {
if ( $_REQUEST['command'] == 'start' if ( $_REQUEST['command'] == 'start'

2
web/skins/classic/css/base/skin.css
View File

@ -123,7 +123,7 @@ table th:last-child{
a:link { a:link {
color: #3498db; color: #0fbcf9;
text-decoration: none; text-decoration: none;
} }

16
web/skins/classic/views/filter.php
View File

@ -53,17 +53,17 @@ foreach ( ZM\Filter::find(null,array('order'=>'lower(Name)')) as $Filter ) {
$filter = $Filter; $filter = $Filter;
} }
} }
if ( !$filter ) { if ( !$filter ) {
$filter = new ZM\Filter(); $filter = new ZM\Filter();
if ( isset($_REQUEST['filter']) ) {
# Update our filter object with whatever changes we have made before saving
$filter->set($_REQUEST['filter']);
}
} else {
ZM\Debug('filter: ' . print_r($filter,true));
} }
if ( isset($_REQUEST['filter']) ) {
# Update our filter object with whatever changes we have made before saving
$filter->set($_REQUEST['filter']);
ZM\Debug("Setting filter from " . print_r($_REQUEST['filter'], true));
}
ZM\Debug('filter: ' . print_r($filter,true));
$conjunctionTypes = ZM\getFilterQueryConjunctionTypes(); $conjunctionTypes = ZM\getFilterQueryConjunctionTypes();
$obracketTypes = array(); $obracketTypes = array();
$cbracketTypes = array(); $cbracketTypes = array();