amacocian/monica
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

fix: fix return_from_search colmuns handle (#3030)

Browse Source
This commit is contained in:
Alexis Saettler
2019-09-19 18:02:23 +02:00
committed by GitHub
parent b100267ee5
commit bd0bdfe0fa
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Traits/Searchable.php
+5 -3
View File
@@ -25,18 +25,20 @@ trait Searchable
return;
}
$columns = array_map(function ($column) {
$searchableColumns = array_map(function ($column) {
return "`{$this->getTable()}`.`$column`";
}, $this->searchable_columns);
$queryString = StringHelper::buildQuery($columns, $needle);
$queryString = StringHelper::buildQuery($searchableColumns, $needle);
$builder->whereRaw("`{$this->getTable()}`.`account_id` = ".$accountId.' AND ('.$queryString.') '.$whereCondition);
$builder->orderByRaw($orderBy);
if ($sortOrder) {
$builder->sortedBy($sortOrder);
}
$builder->select($this->return_from_search);
$builder->select(array_map(function ($column) {
return "{$this->getTable()}.$column";
}, $this->return_from_search));
return $builder->paginate($limitPerPage);
}