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-02 13:01:28 -07:00
parent cf09908c60 87affa40ed
commit e64cf8b320
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Models/Asset.php
View file

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

8
config/version.php
View file

@ -1,7 +1,7 @@
<?php
return array (
'app_version' => 'v4.1.1',
'build_version' => '46',
'hash_version' => 'g28a4293',
'full_hash' => 'v4.1.1-46-g28a4293',
'app_version' => 'v4.1.2',
'build_version' => '48',
'hash_version' => 'gd21c92f',
'full_hash' => 'v4.1.2-48-gd21c92f',
);