Merge remote-tracking branch 'origin/develop'

snipe · snipe · commit e1c0a80c2065 · 2024-11-27T13:52:03.000Z
diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php
@@ -765,9 +765,9 @@ public function update(UpdateAssetRequest $request, Asset $asset): JsonResponse
             }
 
             if ($problems_updating_encrypted_custom_fields) {
-                return response()->json(Helper::formatStandardApiResponse('success', $asset, trans('admin/hardware/message.update.encrypted_warning')));
+                return response()->json(Helper::formatStandardApiResponse('success', (new AssetsTransformer)->transformAsset($asset), trans('admin/hardware/message.update.encrypted_warning')));
             } else {
-                return response()->json(Helper::formatStandardApiResponse('success', $asset, trans('admin/hardware/message.update.success')));
+                return response()->json(Helper::formatStandardApiResponse('success', (new AssetsTransformer)->transformAsset($asset), trans('admin/hardware/message.update.success')));
             }
         }
         return response()->json(Helper::formatStandardApiResponse('error', null, $asset->getErrors()), 200);

Original file line number	Diff line number	Diff line change
`@@ -765,9 +765,9 @@ public function update(UpdateAssetRequest $request, Asset $asset): JsonResponse`
`765`	`765`	`}`
`766`	`766`
`767`	`767`	`if ($problems_updating_encrypted_custom_fields) {`
`768`		`- return response()->json(Helper::formatStandardApiResponse('success', $asset, trans('admin/hardware/message.update.encrypted_warning')));`
	`768`	`+ return response()->json(Helper::formatStandardApiResponse('success', (new AssetsTransformer)->transformAsset($asset), trans('admin/hardware/message.update.encrypted_warning')));`
`769`	`769`	`} else {`
`770`		`- return response()->json(Helper::formatStandardApiResponse('success', $asset, trans('admin/hardware/message.update.success')));`
	`770`	`+ return response()->json(Helper::formatStandardApiResponse('success', (new AssetsTransformer)->transformAsset($asset), trans('admin/hardware/message.update.success')));`
`771`	`771`	`}`
`772`	`772`	`}`
`773`	`773`	`return response()->json(Helper::formatStandardApiResponse('error', null, $asset->getErrors()), 200);`