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

When adding a new monitor, ModelId and ManufacturerId are not defined, so handle that

This commit is contained in:
Isaac Connor 2022-02-06 19:06:35 -05:00
parent ac909d404a
commit 69053424cd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/includes/Monitor.php
View File

@ -698,7 +698,7 @@ class Monitor extends ZM_Object {
} }
function Model() { function Model() {
if (!property_exists($this, 'Model')) { if (!property_exists($this, 'Model')) {
if ($this->{'ModelId'}) { if (property_exists($this, 'ModelId') and $this->{'ModelId'}) {
$this->{'Model'} = Model::find_one(array('Id'=>$this->ModelId())); $this->{'Model'} = Model::find_one(array('Id'=>$this->ModelId()));
if (!$this->{'Model'}) if (!$this->{'Model'})
$this->{'Model'} = new Model(); $this->{'Model'} = new Model();
@ -710,7 +710,7 @@ class Monitor extends ZM_Object {
} }
function Manufacturer() { function Manufacturer() {
if (!property_exists($this, 'Manufacturer')) { if (!property_exists($this, 'Manufacturer')) {
if ($this->{'ManufacturerId'}) { if (property_exists($this, 'ManufacturerId') and $this->{'ManufacturerId'}) {
$this->{'Manufacturer'} = Manufacturer::find_one(array('Id'=>$this->ManufacturerId())); $this->{'Manufacturer'} = Manufacturer::find_one(array('Id'=>$this->ManufacturerId()));
if (!$this->{'Manufacturer'}) if (!$this->{'Manufacturer'})
$this->{'Manufacturer'} = new Manufacturer(); $this->{'Manufacturer'} = new Manufacturer();