DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-23 19:59:18 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Misc assetLoc error checks

Browse source
This commit is contained in:
snipe 2017-10-31 08:47:40 -07:00
parent 772785f9b5
commit 6186c324b5
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/Models/Asset.php
View file

@ -266,17 +266,23 @@ class Asset extends Depreciable
throw new \Exception("Asset assignment Loop for Asset ID: ".$first_asset->id);
}
$assigned_to=Asset::find($this->assigned_to); //have to do this this way because otherwise it errors
return $assigned_to->assetLoc(); // Recurse until we have a final location
if ($assigned_to) {
return $assigned_to->assetLoc();
} // Recurse until we have a final location
}
if ($this->assignedType() == self::LOCATION) {
return $this->assignedTo;
if ($this->assignedTo) {
return $this->assignedTo;
}
}
if ($this->assignedType() == self::USER) {
if (!$this->assignedTo->userLoc) {
//this makes no sense
return $this->defaultLoc;
if (($this->assignedTo) && $this->assignedTo->userLoc) {
return $this->assignedTo->userLoc;
}
return $this->assignedTo->userLoc;
//this makes no sense
return $this->defaultLoc;
}
}