DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixes the generation of where conditions (#5902)

Browse source
This commit is contained in:
Till Deeke 2018-07-20 22:23:29 +02:00 committed by snipe
parent b6e3715cd8
commit 45a2932f4b
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/Models/Traits/Searchable.php
View file

@ -68,6 +68,8 @@ trait Searchable {
$table = $this->getTable(); $table = $this->getTable();
$firstConditionAdded = false;
foreach($this->getSearchableAttributes() as $column) { foreach($this->getSearchableAttributes() as $column) {
foreach($terms as $term) { foreach($terms as $term) {
@ -80,6 +82,19 @@ trait Searchable {
continue; continue;
} }
/**
* We need to form the query properly, starting with a "where",
* otherwise the generated select is wrong.
*
* @todo This does the job, but is inelegant and fragile
*/
if (!$firstConditionAdded) {
$query = $query->where($table . '.' . $column, 'LIKE', '%'.$term.'%');
$firstConditionAdded = true;
continue;
}
$query = $query->orWhere($table . '.' . $column, 'LIKE', '%'.$term.'%'); $query = $query->orWhere($table . '.' . $column, 'LIKE', '%'.$term.'%');
} }
} }