DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-20 07:47:41 -07:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Small refactor to ALWAYS return deleted assets in a collection transformer

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2023-01-09 20:23:05 -08:00
parent bf849128fc
commit ae76d46f87
1 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
app/Http/Controllers/Api/AssetsController.php
View file

@ -379,17 +379,19 @@ class AssetsController extends Controller
$assets = $assets->withTrashed();
}
$assets = $assets->get();
if (($assets = $assets->get()) && ($assets->count()) > 0) {
// If there is only one result, we should pull the first (and only) asset from the returned collection, since
// transformAsset() expects an Asset object, NOT a collection
if (($assets) && ($assets->count() == 1)) {
return (new AssetsTransformer)->transformAsset($assets->first());
// If there is only one result, we should pull the first (and only) asset from the returned collection, since
// transformAsset() expects an Asset object, NOT a collection
if ($assets->count() == 1) {
return (new AssetsTransformer)->transformAsset($assets->first());
// If there is more than one result OR if the endpoint is requesting deleted items (even if there is only one
// match, return the normal collection transformed.
} elseif (($assets->count() > 1) || ($request->input('deleted') == 'true')) {
return (new AssetsTransformer)->transformAssets($assets, $assets->count());
}
// If there is more than one result - which would probably never show up in the UI, since it would only happen if
// there are multiple deleted assets with the same tag, pass the collection normally
} elseif (($assets) && ($assets->count() > 1)) {
return (new AssetsTransformer)->transformAssets($assets, $assets->count());
}
// If there are 0 results, return the "no such asset" response
@ -418,15 +420,19 @@ class AssetsController extends Controller
$assets = $assets->get();
// If there is only one result, we should pull the first (and only) asset from the returned collection, since
// transformAsset() expects an Asset object, NOT a collection
if (($assets) && ($assets->count() == 1)) {
return (new AssetsTransformer)->transformAsset($assets->first());
if (($assets = $assets->get()) && ($assets->count()) > 0) {
// If there is exactly one result, we should pull the first (and only) asset from the returned collection, since
// transformAsset() expects an Asset object, NOT a collection
if ($assets->count() == 1) {
return (new AssetsTransformer)->transformAsset($assets->first());
// If there is more than one result OR if the endpoint is requesting deleted items (even if there is only one
// match, return the normal collection transformed.
} elseif (($assets->count() > 1) || ($request->input('deleted') == 'true')) {
return (new AssetsTransformer)->transformAssets($assets, $assets->count());
}
// If there is more than one result - which would probably never show up in the UI, since it would only happen if
// there are multiple deleted assets with the same tag, pass the collection normally
} elseif (($assets) && ($assets->count() > 1)) {
return (new AssetsTransformer)->transformAssets($assets, $assets->count());
}
// If there are 0 results, return the "no such asset" response