ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

pull/3949/head^2
Isaac Connor 2024-04-08 20:02:51 -04:00
parent 6744a46148 ab106aaf8f
commit 215cc9af8b
2 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
web/includes/Object.php
View File

@ -203,27 +203,27 @@ class ZM_Object {
$this->{$field} = implode(',', $value); $this->{$field} = implode(',', $value);
} else if (is_string($value)) { } else if (is_string($value)) {
if (array_key_exists($field, $this->defaults)) { if (array_key_exists($field, $this->defaults)) {
# Need filtering # Need filtering
if (is_array($this->defaults[$field]) && isset($this->defaults[$field]['filter_regexp'])) { if (is_array($this->defaults[$field]) && isset($this->defaults[$field]['filter_regexp'])) {
if (is_array($this->defaults[$field]['filter_regexp'])) { if (is_array($this->defaults[$field]['filter_regexp'])) {
foreach ($this->defaults[$field]['filter_regexp'] as $regexp) { foreach ($this->defaults[$field]['filter_regexp'] as $regexp) {
$this->{$field} = preg_replace($regexp, '', trim($value)); $this->{$field} = preg_replace($regexp, '', trim($value));
} }
} else { } else {
$this->{$field} = preg_replace($this->defaults[$field]['filter_regexp'], '', trim($value)); $this->{$field} = preg_replace($this->defaults[$field]['filter_regexp'], '', trim($value));
} }
} else if ($value == '') { } else if ($value == '') {
if (is_array($this->defaults[$field])) { if (is_array($this->defaults[$field])) {
$this->{$field} = $this->defaults[$field]['default']; $this->{$field} = $this->defaults[$field]['default'];
} else if (is_string($this->defaults[$field])) { } else if (is_string($this->defaults[$field])) {
# if the default is a string, don't set it. Having a default for empty string is to set null for numbers. # if the default is a string, don't set it. Having a default for empty string is to set null for numbers.
$this->{$field} = $value; $this->{$field} = $value;
} else { } else {
$this->{$field} = $this->defaults[$field]; $this->{$field} = $this->defaults[$field];
} }
} else { } else {
$this->{$field} = $value; $this->{$field} = $value;
} # need a default } # need a default
} else { } else {
$this->{$field} = $value; $this->{$field} = $value;
} }

7
web/skins/classic/views/js/filter.js
View File

@ -382,9 +382,10 @@ function addTerm( element ) {
var row = $j(element).closest('tr'); var row = $j(element).closest('tr');
row.find('select').chosen('destroy'); row.find('select').chosen('destroy');
var newRow = row.clone().insertAfter(row); var newRow = row.clone().insertAfter(row);
newRow.find('select').each( function() { //reset new row to default //newRow.find('select').each( function() { //reset new row to default
this[0].selected = 'selected'; // if ($j(this).find('option').length > 0 )
}); // this[0].selected = 'selected';
//});
newRow.find('input[type="text"]').val(''); newRow.find('input[type="text"]').val('');
newRow[0].querySelectorAll("button[data-on-click-this]").forEach(function(el) { newRow[0].querySelectorAll("button[data-on-click-this]").forEach(function(el) {
var fnName = el.getAttribute("data-on-click-this"); var fnName = el.getAttribute("data-on-click-this");