mirror of
https://github.com/snipe/snipe-it.git
synced 2025-03-05 20:52:15 -08:00
Check for valid asset before accessing properties
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
parent
3edb501973
commit
f8311815ee
|
@ -26,17 +26,18 @@ class AssetMaintenancesTransformer
|
||||||
'id' => (int) $assetmaintenance->id,
|
'id' => (int) $assetmaintenance->id,
|
||||||
'asset' => ($assetmaintenance->asset) ? [
|
'asset' => ($assetmaintenance->asset) ? [
|
||||||
'id' => (int) $assetmaintenance->asset->id,
|
'id' => (int) $assetmaintenance->asset->id,
|
||||||
'name'=> ($assetmaintenance->asset->name) ? e($assetmaintenance->asset->name) : null,
|
'name'=> (($assetmaintenance->asset) && ($assetmaintenance->asset->name)) ? e($assetmaintenance->asset->name) : null,
|
||||||
'asset_tag'=> e($assetmaintenance->asset->asset_tag),
|
'asset_tag'=> e($assetmaintenance->asset->asset_tag),
|
||||||
'serial'=> e($assetmaintenance->asset->serial),
|
'serial'=> e($assetmaintenance->asset->serial),
|
||||||
'deleted_at'=> e($assetmaintenance->asset->deleted_at),
|
'deleted_at'=> ($assetmaintenance->asset) ? Helper::getFormattedDateObject($assetmaintenance->asset->deleted_at, 'datetime') : null,
|
||||||
'created_at'=> e($assetmaintenance->asset->created_at),
|
'created_at' => ($assetmaintenance->asset) ? Helper::getFormattedDateObject($assetmaintenance->asset->created_at, 'datetime') : null,
|
||||||
|
'updated_at' => ($assetmaintenance->asset) ? Helper::getFormattedDateObject($assetmaintenance->asset->updated_at, 'datetime') : null,
|
||||||
] : null,
|
] : null,
|
||||||
'model' => (($assetmaintenance->asset) && ($assetmaintenance->asset->model)) ? [
|
'model' => (($assetmaintenance->asset) && ($assetmaintenance->asset->model)) ? [
|
||||||
'id' => (int) $assetmaintenance->asset->model->id,
|
'id' => (int) $assetmaintenance->asset->model->id,
|
||||||
'name'=> ($assetmaintenance->asset->model->name) ? e($assetmaintenance->asset->model->name).' '.e($assetmaintenance->asset->model->model_number) : null,
|
'name'=> ($assetmaintenance->asset->model->name) ? e($assetmaintenance->asset->model->name).' '.e($assetmaintenance->asset->model->model_number) : null,
|
||||||
] : null,
|
] : null,
|
||||||
'status_label' => ($assetmaintenance->asset->assetstatus) ? [
|
'status_label' => (($assetmaintenance->asset) && ($assetmaintenance->asset->assetstatus)) ? [
|
||||||
'id' => (int) $assetmaintenance->asset->assetstatus->id,
|
'id' => (int) $assetmaintenance->asset->assetstatus->id,
|
||||||
'name'=> e($assetmaintenance->asset->assetstatus->name),
|
'name'=> e($assetmaintenance->asset->assetstatus->name),
|
||||||
'status_type'=> e($assetmaintenance->asset->assetstatus->getStatuslabelType()),
|
'status_type'=> e($assetmaintenance->asset->assetstatus->getStatuslabelType()),
|
||||||
|
@ -79,7 +80,7 @@ class AssetMaintenancesTransformer
|
||||||
];
|
];
|
||||||
|
|
||||||
$permissions_array['available_actions'] = [
|
$permissions_array['available_actions'] = [
|
||||||
'update' => (Gate::allows('update', Asset::class) && ($assetmaintenance->asset->deleted_at=='')) ? true : false,
|
'update' => (Gate::allows('update', Asset::class) && ((($assetmaintenance->asset) && $assetmaintenance->asset->deleted_at==''))) ? true : false,
|
||||||
'delete' => Gate::allows('delete', Asset::class),
|
'delete' => Gate::allows('delete', Asset::class),
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue