kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-06 14:12:15 +00:00
Code Issues Projects Releases Wiki Activity

Fix #2564

Browse Source
This commit is contained in:
James Cole
2019-09-08 20:21:44 +02:00
parent 2de79ea392
commit 5ae91845c1
6 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/v1/recurring/create.twig
View File

@@ -101,7 +101,7 @@
{# destination account name for withdrawals #}
{#{{ ExpandedForm.text('destination_name', null, {label: trans('form.expense_account')}) }} #}
{# for withdrawals, also a drop down with expense accounts, loans, debts, mortgages or (cash). #}
{# NEW for withdrawals, also a drop down with expense accounts, loans, debts, mortgages or (cash). #}
{{ AccountForm.activeWithdrawalDestinations('withdrawal_destination_id', null, {label: trans('form.withdrawal_destination_id')}) }}
</div>
</div>

3
resources/views/v1/search/index.twig
View File

@@ -121,7 +121,8 @@
var edit_bulk_selected_txt = "{{ trans('firefly.bulk_edit')|escape('js') }}";
var searchQuery = "{{ fullQuery|escape('js') }}";
var searchUri = "{{ route('search.search') }}";
var searchUri = "{{ route('search.search') }}?page={{ page }}";
var searchPage = {{ page }};
</script>
{# required for groups.twig #}
<script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ FF_VERSION }}"></script>

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

@@ -1,6 +1,10 @@
<p>
<p class="search_count">
{{ trans('firefly.search_found_transactions', {count: groups.count, time: searchTime}) }}
{% if hasPages %}
{{ trans('firefly.search_found_transactions', {count: '>'~groups.perPage, time: searchTime}) }}
{% else %}
{{ trans('firefly.search_found_transactions', {count: groups.count, time: searchTime}) }}
{% endif %}
</p>
{% include 'list.groups' %}