IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Partial fix for #3840

Browse Source
This commit is contained in:
James Cole 2020-09-23 19:29:10 +02:00
parent fc157b2944
commit 5f5346ed71
No known key found for this signature in database
GPG Key ID: B5669F9493CDE38D
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/SearchController.php
View File

@ -113,6 +113,7 @@ class SearchController extends Controller
$parameters = ['search' => $fullQuery];
$url = route('search.index') . '?' . http_build_query($parameters);
$groups->setPath($url);
try {
$html = view('search.search', compact('groups', 'hasPages', 'searchTime'))->render();
// @codeCoverageIgnoreStart

4
app/Support/Search/OperatorQuerySearch.php
View File

@ -246,11 +246,11 @@ class OperatorQuerySearch implements SearchInterface
$value = $searchNode->getNode()->getValue();
// must be valid operator:
if (in_array($operator, $this->validOperators, true)) {
if ($this->updateCollector($operator, $value)) {
if ($this->updateCollector($operator, (string) $value)) {
$this->operators->push(
[
'type' => self::getRootOperator($operator),
'value' => $value,
'value' => (string) $value,
]
);
}

2
resources/views/v1/list/groups.twig
View File

@ -52,7 +52,7 @@ TODO: hide and show columns
</thead>
<tbody>
{% for group in groups %}
{% if group.count > 1 %}
{% if group.count() > 1 %}
<tr style="border-top:1px #aaa solid;">
<td colspan="2" style="border-top:1px #aaa solid;">
<small><strong>

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

@ -1,6 +1,8 @@
<p class="search_count">
{% if hasPages %}
{% if true == hasPages %}
{{ trans('firefly.search_found_more_transactions', {count: groups.count(), time: searchTime}) }}
{% elseif 0 == groups.count() %}
{{ trans_choice('firefly.search_found_transactions', 0, {time: searchTime}) }}
{% else %}
{{ trans_choice('firefly.search_found_transactions', groups.perPage(), {time: searchTime}) }}
{% endif %}