Merge branch 'develop'

This commit is contained in:
snipe 2017-11-03 15:05:07 -07:00
commit 5d9b9ad590

View file

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