kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-30 10:33:30 +00:00
Code Issues Projects Releases Wiki Activity

Fixed search as well.

Browse Source
This commit is contained in:
James Cole
2016-03-02 13:56:56 +01:00
parent 2e7703bc97
commit 2fd476ada8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Support/Search/Search.php
View File

@@ -103,16 +103,16 @@ class Search implements SearchInterface
public function searchTransactions(array $words): Collection public function searchTransactions(array $words): Collection
{ {
// decrypted transaction journals: // decrypted transaction journals:
$decrypted = Auth::user()->transactionjournals()->withRelevantData()->where('encrypted', 0)->where( // TODO firefly will crash here. $decrypted = Auth::user()->transactionjournals()->expanded()->where('encrypted', 0)->where(
function (EloquentBuilder $q) use ($words) { function (EloquentBuilder $q) use ($words) {
foreach ($words as $word) { foreach ($words as $word) {
$q->orWhere('description', 'LIKE', '%' . e($word) . '%'); $q->orWhere('description', 'LIKE', '%' . e($word) . '%');
} }
} }
)->get(); )->get(TransactionJournal::QUERYFIELDS);
// encrypted // encrypted
$all = Auth::user()->transactionjournals()->withRelevantData()->where('encrypted', 1)->get(); // TODO firefly will crash here. $all = Auth::user()->transactionjournals()->expanded()->where('encrypted', 1)->get(TransactionJournal::QUERYFIELDS);
$set = $all->filter( $set = $all->filter(
function (TransactionJournal $journal) use ($words) { function (TransactionJournal $journal) use ($words) {
foreach ($words as $word) { foreach ($words as $word) {