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

Merge pull request #10258 from PlaneNuts/Fix_Advanced_Search/Checked_Out_To

Browse source 
Fixed #8828: Can't search by checked out user in advanced search
This commit is contained in:
snipe 2021-11-02 14:53:08 -07:00 committed by GitHub
parent eae9bf574f 2c7a71a2a1
commit 98de8526db
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') { if ($fieldname =='assigned_to') {
$query->whereHas('assigneduser', function ($query) use ($search_val) { $query->whereHasMorph('assignedTo', [User::class], function ($query) use ($search_val) {
$query->where(function ($query) use ($search_val) { $query->where(function ($query) use ($search_val) {
$query->where('users.first_name', 'LIKE', '%'.$search_val.'%') $query->where('users.first_name', 'LIKE', '%'.$search_val.'%')
->orWhere('users.last_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 * 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') 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 . '%'); $query->where('assets.'.$fieldname, 'LIKE', '%' . $search_val . '%');
} }
}
}); });