lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge pull request #10415 from uberbrady/fix_actionlog_memory_exhaustion

Browse source 
Remove 'actionlog' from the ::with() clause in the asset query API
This commit is contained in:
snipe 2021-12-10 19:10:40 -08:00 • committed by GitHub
commit d0e7879c89
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -115,8 +115,8 @@ 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', 'company', 'defaultLoc','assignedTo',
'model.category', 'model.manufacturer', 'model.fieldset','supplier'); 'model.category', 'model.manufacturer', 'model.fieldset','supplier'); //it might be tempting to add 'assetlog' here, but don't. It blows up update-heavy users.
// These are used by the API to query against specific ID numbers. // These are used by the API to query against specific ID numbers.