ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions 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
Download Patch File Download Diff File Expand all files Collapse all files
app/Models/Asset.php
+5 -2
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 . '%');
});