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

Make search work. [skip ci]

Browse Source
This commit is contained in:
James Cole
2017-02-19 09:36:51 +01:00
parent bf35ecc07a
commit b149a816dd
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -241,8 +241,6 @@ class Search implements SearchInterface
} while (!$reachedEndOfList && !$foundEnough); } while (!$reachedEndOfList && !$foundEnough);
$result = $result->slice(0, $this->limit); $result = $result->slice(0, $this->limit);
var_dump($result->toArray());
exit;
return $result; return $result;
} }

2
resources/lang/en_US/firefly.php
View File

@@ -26,6 +26,8 @@ return [
'showEverything' => 'Show everything', 'showEverything' => 'Show everything',
'never' => 'Never', 'never' => 'Never',
'search_results_for' => 'Search results for ":query"', 'search_results_for' => 'Search results for ":query"',
'advanced_search' => 'Advanced search',
'advanced_search_intro' => 'There are several modifiers that you can use in your search to narrow down the results. If you use any of these, the search will <em>only</em> return transactions. Please click the <i class="fa fa-question-circle"></i>-icon for more information.',
'bounced_error' => 'The message sent to :email bounced, so no access for you.', 'bounced_error' => 'The message sent to :email bounced, so no access for you.',
'deleted_error' => 'These credentials do not match our records.', 'deleted_error' => 'These credentials do not match our records.',
'general_blocked_error' => 'Your account has been disabled, so you cannot login.', 'general_blocked_error' => 'Your account has been disabled, so you cannot login.',

4
resources/views/search/index.twig
View File

@@ -22,9 +22,7 @@
</div> </div>
<div class="box-body"> <div class="box-body">
<p> <p>
There are several modifiers that you can use in your search to narrow down the results. {{ 'advanced_search_intro'|_ }}
If you use any of these, the search will <em>only</em> return transactions.
Please click the <i class="fa fa-question-circle"></i>-icon for more information.
</p> </p>
{# search form #} {# search form #}
<form class="form-horizontal" action="{{ route('search.index') }}" method="get"> <form class="form-horizontal" action="{{ route('search.index') }}" method="get">