Merge branch 'master' of github.com:ZoneMinder/zoneminder
This commit is contained in:
commit
2c899bd3c5
|
@ -60,7 +60,7 @@ class Filter extends ZM_Object {
|
|||
$this->_querystring .= $term->querystring($objectname, $separator);
|
||||
} # end foreach term
|
||||
if ( $this->Id() ) {
|
||||
$this->_querystring .= $separator.$objectname.'[Id]='.$this->Id();
|
||||
$this->_querystring .= $separator.$objectname.urlencode('[Id]=').$this->Id();
|
||||
}
|
||||
}
|
||||
return $this->_querystring;
|
||||
|
|
|
@ -95,7 +95,7 @@ if ( isset($_REQUEST['object']) and ( $_REQUEST['object'] == 'filter' ) ) {
|
|||
} else if ( $filter->Background() ) {
|
||||
$filter->control('start');
|
||||
}
|
||||
$redirect = '?view=filter&Id='.$filter->Id();
|
||||
$redirect = '?view=filter'.$filter->querystring();
|
||||
|
||||
} else if ( $action == 'control' ) {
|
||||
if ( $_REQUEST['command'] == 'start'
|
||||
|
|
|
@ -123,7 +123,7 @@ table th:last-child{
|
|||
|
||||
|
||||
a:link {
|
||||
color: #3498db;
|
||||
color: #0fbcf9;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
|
|
|
@ -55,14 +55,14 @@ foreach ( ZM\Filter::find(null,array('order'=>'lower(Name)')) as $Filter ) {
|
|||
}
|
||||
if ( !$filter ) {
|
||||
$filter = new ZM\Filter();
|
||||
}
|
||||
|
||||
if ( isset($_REQUEST['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));
|
||||
ZM\Debug("Setting filter from " . print_r($_REQUEST['filter'], true));
|
||||
}
|
||||
ZM\Debug('filter: ' . print_r($filter,true));
|
||||
|
||||
$conjunctionTypes = ZM\getFilterQueryConjunctionTypes();
|
||||
$obracketTypes = array();
|
||||
|
|
Loading…
Reference in New Issue