DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-28 06:59:41 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2 from snipe/develop

Browse source 
Develop
This commit is contained in:
Nuraeil 2021-11-04 19:16:00 +01:00 committed by GitHub
parent 63b30489df 98de8526db
commit 3f2749d5d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/Models/Asset.php
View file

@ -1357,8 +1357,8 @@ class Asset extends Depreciable
});
}
if ($fieldname == 'checkedout_to') {
$query->whereHas('assigneduser', function ($query) use ($search_val) {
if ($fieldname =='assigned_to') {
$query->whereHasMorph('assignedTo', [User::class], function ($query) use ($search_val) {
$query->where(function ($query) use ($search_val) {
$query->where('users.first_name', 'LIKE', '%'.$search_val.'%')
->orWhere('users.last_name', 'LIKE', '%'.$search_val.'%');
@ -1421,7 +1421,7 @@ class Asset extends Depreciable
});
});
}
}
/**
* THIS CLUNKY BIT IS VERY IMPORTANT
@ -1447,11 +1447,11 @@ class Asset extends Depreciable
*/
if (($fieldname!='category') && ($fieldname!='model_number') && ($fieldname!='rtd_location') && ($fieldname!='location') && ($fieldname!='supplier')
&& ($fieldname!='status_label') && ($fieldname!='model') && ($fieldname!='company') && ($fieldname!='manufacturer')) {
&& ($fieldname!='status_label') && ($fieldname!='assigned_to') && ($fieldname!='model') && ($fieldname!='company') && ($fieldname!='manufacturer')) {
$query->where('assets.'.$fieldname, 'LIKE', '%' . $search_val . '%');
}
}
});