DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Added location method, fixed assetLoc

Browse source
This commit is contained in:
snipe 2017-10-28 01:48:27 -07:00
parent c70db75de9
commit ce5ccc31f0
1 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
app/Models/Asset.php
View file

@ -255,23 +255,33 @@ class Asset extends Depreciable
**/ **/
public function assetLoc() public function assetLoc()
{ {
static $iterations=0;
static $first_asset;
if (!empty($this->assignedType())) { if (!empty($this->assignedType())) {
// dd($this->assignedType());
if ($this->assignedType() == self::ASSET) { if ($this->assignedType() == self::ASSET) {
return $this->assignedto->assetloc(); // Recurse until we have a final location $iterations++;
if(!$first_asset) {
$first_asset=$this;
}
if($iterations>10) {
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 ($this->assignedType() == self::LOCATION) { if ($this->assignedType() == self::LOCATION) {
return $this->assignedTo(); return $this->assignedTo;
} }
if ($this->assignedType() == self::USER) { if ($this->assignedType() == self::USER) {
if (!$this->assignedTo) { if (!$this->assignedTo->userLoc) {
return $this->defaultLoc(); //this makes no sense
return $this->defaultLoc;
} }
return $this->assignedTo->userLoc(); return $this->assignedTo->userLoc;
} }
} }
return $this->defaultLoc(); return $this->defaultLoc;
} }
public function assignedType() public function assignedType()
@ -407,6 +417,12 @@ class Asset extends Depreciable
} }
public function location()
{
return $this->belongsTo('\App\Models\Location', 'location_id');
}
/** /**
* Get auto-increment * Get auto-increment