mirror of
https://github.com/snipe/snipe-it.git
synced 2024-11-16 02:24:09 -08:00
Merge remote-tracking branch 'origin/develop'
This commit is contained in:
commit
d71a04e489
|
@ -45,7 +45,7 @@ class AssetMaintenancesTransformer
|
||||||
'name'=> e($assetmaintenance->asset->location->name),
|
'name'=> e($assetmaintenance->asset->location->name),
|
||||||
|
|
||||||
] : null,
|
] : null,
|
||||||
'rtd_location' => ($assetmaintenance->asset->defaultLoc) ? [
|
'rtd_location' => (($assetmaintenance->asset) && ($assetmaintenance->asset->defaultLoc)) ? [
|
||||||
'id' => (int) $assetmaintenance->asset->defaultLoc->id,
|
'id' => (int) $assetmaintenance->asset->defaultLoc->id,
|
||||||
'name'=> e($assetmaintenance->asset->defaultLoc->name),
|
'name'=> e($assetmaintenance->asset->defaultLoc->name),
|
||||||
] : null,
|
] : null,
|
||||||
|
|
Loading…
Reference in a new issue