Merge remote-tracking branch 'origin/develop'

This commit is contained in:
snipe 2024-01-08 17:24:47 +00:00
commit d71a04e489

View file

@ -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,