DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Make 'pending' assets properly requestable; use requestable scope

Browse source
This commit is contained in:
Brady Wetherington 2022-01-14 12:48:33 -08:00
parent cfb64be9a4
commit ef463a37d8
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -937,7 +937,7 @@ class AssetsController extends Controller
$assets = Company::scopeCompanyables(Asset::select('assets.*'), 'company_id', 'assets') $assets = Company::scopeCompanyables(Asset::select('assets.*'), 'company_id', 'assets')
->with('location', 'assetstatus', 'assetlog', 'company', 'defaultLoc','assignedTo', ->with('location', 'assetstatus', 'assetlog', 'company', 'defaultLoc','assignedTo',
'model.category', 'model.manufacturer', 'model.fieldset', 'supplier')->where('assets.requestable', '=', '1'); 'model.category', 'model.manufacturer', 'model.fieldset', 'supplier')->requestableAssets();
$offset = request('offset', 0); $offset = request('offset', 0);
$limit = $request->input('limit', 50); $limit = $request->input('limit', 50);

5
app/Models/Asset.php
View file

@ -1167,9 +1167,10 @@ class Asset extends Depreciable
{ {
return Company::scopeCompanyables($query->where('requestable', '=', 1)) return Company::scopeCompanyables($query->where('requestable', '=', 1))
->whereHas('assetstatus', function ($query) { ->whereHas('assetstatus', function ($query) {
$query->where(function ($query) {
$query->where('deployable', '=', 1) $query->where('deployable', '=', 1)
->where('pending', '=', 0) ->where('archived', '=', 0); // you definitely can't request something that's archived
->where('archived', '=', 0); })->orWhere('pending', '=', 1); // we've decided that even though an asset may be 'pending', you can still request it
}); });
} }