DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 23:54:12 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse source
This commit is contained in:
snipe 2017-11-06 10:30:42 -08:00
parent 623f21e51f 4818e1b8ca
commit def69b1aaa
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/Models/Asset.php
View file

@ -939,8 +939,9 @@ class Asset extends Depreciable
} }
} }
if (($fieldname!='category') && ($fieldname!='status_label') && ($fieldname!='model')) { if (($fieldname!='category') && ($fieldname!='location')
$query->orWhere('assets.'.$fieldname, 'LIKE', '%' . $search_val . '%'); && ($fieldname!='status_label') && ($fieldname!='model')) {
$query->orWhere('assets.'.$fieldname, 'LIKE', '%' . $search_val . '%');
} }