Merge branch 'develop'

This commit is contained in:
snipe 2017-11-06 10:30:42 -08:00
commit def69b1aaa

View file

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