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

Fixed erroneous call to assets.category in filter scope

Browse source
This commit is contained in:
snipe 2017-11-02 08:06:10 -07:00
parent f43692938b
commit 3695e118f4
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/Models/Asset.php
View file

@ -872,7 +872,7 @@ class Asset extends Depreciable
}
if ($fieldname =='location') {
$query->whereHas('defaultLoc', function ($query) use ($search_val) {
$query->whereHas('location', function ($query) use ($search_val) {
$query->where('locations.name', 'LIKE', '%' . $search_val . '%');
});
}
@ -935,8 +935,11 @@ class Asset extends Depreciable
}
}
if ($fieldname!='category') {
$query->orWhere('assets.'.$fieldname, 'LIKE', '%' . $search_val . '%');
}
$query->orWhere('assets.'.$fieldname, 'LIKE', '%' . $search_val . '%');
});