DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-02 08:21:09 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed only undeployed assets in checkout to list

Browse source
This commit is contained in:
snipe 2017-11-03 11:33:36 -07:00
parent ab9729c39a
commit 3ecaa99990
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -282,7 +282,8 @@ class AssetsController extends Controller
'assets.name', 'assets.name',
'assets.asset_tag', 'assets.asset_tag',
'assets.model_id', 'assets.model_id',
]))->with('model')->RTD(); 'assets.status_id'
])->with('model', 'assetstatus')->NotArchived());
if ($request->has('search')) { if ($request->has('search')) {
@ -300,6 +301,10 @@ class AssetsController extends Controller
// they may not have a ->name value but we want to display something anyway // they may not have a ->name value but we want to display something anyway
foreach ($assets as $asset) { foreach ($assets as $asset) {
$asset->use_text = $asset->present()->fullName; $asset->use_text = $asset->present()->fullName;
if ($asset->assetstatus->getStatuslabelType()=='pending') {
$asset->use_text = $asset->present()->fullName.' ('.$asset->assetstatus->getStatuslabelType().')';
}
$asset->use_image = ($asset->getImageUrl()) ? $asset->getImageUrl() : null; $asset->use_image = ($asset->getImageUrl()) ? $asset->getImageUrl() : null;
} }