ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use new dynamic scope where possible

Browse Source
This commit is contained in:
Marcus Moore
2023-05-23 13:38:50 -07:00
parent 054d71aedc
commit b2b6f0cf96
2 changed files with 16 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Models/User.php
+8 -14
View File
@@ -646,13 +646,10 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
{
return $query->where('first_name', 'LIKE', '%' . $search . '%')
->orWhere('last_name', 'LIKE', '%' . $search . '%')
->orWhereRaw(
$this->buildMultipleColumnSearch([
DB::getTablePrefix() . 'users.first_name',
DB::getTablePrefix() . 'users.last_name',
]),
["%{$search}%"]
);
->orWhereMultipleColumns([
DB::getTablePrefix() . 'users.first_name',
DB::getTablePrefix() . 'users.last_name',
], $search);
}
/**
@@ -665,13 +662,10 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
public function advancedTextSearch(Builder $query, array $terms) {
foreach($terms as $term) {
$query = $query->orWhereRaw(
$this->buildMultipleColumnSearch([
DB::getTablePrefix() . 'users.first_name',
DB::getTablePrefix() . 'users.last_name',
]),
["%{$term}%"]
);
$query->orWhereMultipleColumns([
DB::getTablePrefix() . 'users.first_name',
DB::getTablePrefix() . 'users.last_name',
], $term);
}
return $query;