kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-31 02:36:28 +00:00
Code Issues Projects Releases Wiki Activity

Fix count reference.

Browse Source
This commit is contained in:
James Cole
2020-09-21 15:56:50 +02:00
parent 5161971373
commit d05fb4472c
21 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/v1/accounts/delete.twig
View File

@@ -33,7 +33,7 @@
{% endif %}
</p>
{% endif %}
{% if account.transactions.count > 0 and account.accountType.type == 'Asset account' %}
{% if account.transactions.count() > 0 and account.accountType.type == 'Asset account' %}
<p class="text-success">
{{ trans_choice('firefly.save_transactions_by_moving', account.transactions|length ) }}
</p>

6
resources/views/v1/accounts/show.twig
View File

@@ -7,7 +7,7 @@
{% block content %}
<div class="row">
<div class="{% if attachments.count == 0 %}col-lg-12 col-md-12 col-sm-12 col-xs-12{% else %}col-lg-8 col-md-6 col-sm-12 col-xs-12{% endif %}">
<div class="{% if attachments.count() == 0 %}col-lg-12 col-md-12 col-sm-12 col-xs-12{% else %}col-lg-8 col-md-6 col-sm-12 col-xs-12{% endif %}">
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">
@@ -32,7 +32,7 @@
</div>
</div>
</div>
{% if attachments.count > 0 %}
{% if attachments.count() > 0 %}
<div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">
<div class="box">
<div class="box-header with-border">
@@ -115,7 +115,7 @@
</div>
</div>
{% endif %}
{% if account.notes.count == 1 %}
{% if account.notes.count() == 1 %}
<div class="col-lg-6">
<div class="box">
<div class="box-header with-border">

4
resources/views/v1/bills/delete.twig
View File

@@ -24,8 +24,8 @@
</p>
<p>
{% if bill.transactionjournals.count > 0 %}
{{ Lang.choice('form.bill_keep_transactions', bill.transactionjournals.count,{count: bill.transactionjournals.count}) }}
{% if bill.transactionjournals.count() > 0 %}
{{ Lang.choice('form.bill_keep_transactions', bill.transactionjournals.count(),{count: bill.transactionjournals.count()}) }}
{% endif %}
</p>
</div>

4
resources/views/v1/bills/edit.twig
View File

@@ -17,8 +17,8 @@
<h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
</div>
<div class="box-body">
{% if rules.count > 0 %}
{{ ExpandedForm.text('name',null, {helpText: trans_choice('firefly.bill_edit_rules', rules.count)}) }}
{% if rules.count() > 0 %}
{{ ExpandedForm.text('name',null, {helpText: trans_choice('firefly.bill_edit_rules', rules.count())}) }}
{% else %}
{{ ExpandedForm.text('name') }}
{% endif %}

4
resources/views/v1/bills/show.twig
View File

@@ -85,7 +85,7 @@
<h3 class="box-title">{{ 'bill_related_rules'|_ }}</h3>
</div>
<div class="box-body">
{% if rules.count > 0 %}
{% if rules.count() > 0 %}
<ul>
{% for rule in rules %}
<li><a href="{{ route('rules.edit', [rule.id]) }}">{{ rule.title }}</a>
@@ -116,7 +116,7 @@
{% endif %}
{% if attachments.count > 0 %}
{% if attachments.count() > 0 %}
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ 'attachments'|_ }}</h3>

4
resources/views/v1/budgets/delete.twig
View File

@@ -25,8 +25,8 @@
</p>
<p>
{% if budget.transactionjournals.count > 0 %}
{{ Lang.choice('form.budget_keep_transactions', budget.transactionjournals.count, {count: budget.transactionjournals.count }) }}
{% if budget.transactionjournals.count() > 0 %}
{{ Lang.choice('form.budget_keep_transactions', budget.transactionjournals.count(), {count: budget.transactionjournals.count() }) }}
{% endif %}
</p>

8
resources/views/v1/budgets/index.twig
View File

@@ -197,7 +197,7 @@
{% endif %}
</div>
{% endif %}
{% if budgets|length == 0 and inactive.count == 0 %}
{% if budgets|length == 0 and inactive.count() == 0 %}
{% include 'partials.empty' with {objectType: 'default', type: 'budgets',route: route('budgets.create')} %}
{# make FF ignore demo for now. #}
{% set shownDemo = true %}
@@ -243,7 +243,7 @@
<i class="fa fa-fw fa-calendar-plus-o" title="{{ 'auto_budget_rollover_icon'|_ }}"></i>
{% endif %}
{% endif %}
{% if budget.attachments.count > 0 %}
{% if budget.attachments.count() > 0 %}
<i class="fa fa-paperclip"></i>
{% endif %}
</td>
@@ -284,7 +284,7 @@
style="display:none;"></span>
{% endfor %}
{% endif %}
{% if budget.budgeted|length < currencies.count %}
{% if budget.budgeted|length < currencies.count() %}
<a href="#" class="btn btn-light btn-xs create_bl" data-id="{{ budget.id }}">
<i class="fa fa-plus-circle"></i>
</a>
@@ -394,7 +394,7 @@
</div>
</div>
</div>
{% if paginator.count > 0 and inactive.count > 0 %}
{% if paginator.count() > 0 and inactive.count() > 0 %}
<div class="col-lg-3 col-md-4 col-sm-12 col-xs-12">
<div class="box" id="createBudgetBox">
<div class="box-header with-border">

4
resources/views/v1/budgets/show.twig
View File

@@ -6,7 +6,7 @@
{% block content %}
<div class="row">
<div class="{% if attachments.count == 0 %}col-lg-12 col-md-12 col-sm-12 col-xs-12{% else %}col-lg-8 col-md-6 col-sm-12 col-xs-12{% endif %}">
<div class="{% if attachments.count() == 0 %}col-lg-12 col-md-12 col-sm-12 col-xs-12{% else %}col-lg-8 col-md-6 col-sm-12 col-xs-12{% endif %}">
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">
@@ -38,7 +38,7 @@
{% endif %}
</div>
</div>
{% if attachments.count > 0 %}
{% if attachments.count() > 0 %}
<div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">
<div class="box">
<div class="box-header with-border">

4
resources/views/v1/categories/delete.twig
View File

@@ -24,8 +24,8 @@
</p>
<p>
{% if category.transactionjournals.count > 0 %}
{{ Lang.choice('form.category_keep_transactions', category.transactionjournals.count, {count: category.transactionjournals.count }) }}
{% if category.transactionjournals.count() > 0 %}
{{ Lang.choice('form.category_keep_transactions', category.transactionjournals.count(), {count: category.transactionjournals.count() }) }}
{% endif %}
</p>
</div>

2
resources/views/v1/categories/index.twig
View File

@@ -5,7 +5,7 @@
{% endblock %}
{% block content %}
{% if categories.count > 0 %}
{% if categories.count() > 0 %}
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="box">

8
resources/views/v1/categories/show.twig
View File

@@ -8,7 +8,7 @@
<div class="row">
{% if Route.getCurrentRoute.getName == 'categories.show' %}
{# both charts #}
<div class="{% if attachments.count == 0 %}col-lg-6 col-md-12 col-sm-12 col-xs-12{% else %}col-lg-4 col-md-12 col-sm-12 col-xs-12{% endif %}">
<div class="{% if attachments.count() == 0 %}col-lg-6 col-md-12 col-sm-12 col-xs-12{% else %}col-lg-4 col-md-12 col-sm-12 col-xs-12{% endif %}">
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">
@@ -20,7 +20,7 @@
</div>
</div>
</div>
<div class="{% if attachments.count == 0 %}col-lg-6 col-md-12 col-sm-12 col-xs-12{% else %}col-lg-4 col-md-12 col-sm-12 col-xs-12{% endif %}">
<div class="{% if attachments.count() == 0 %}col-lg-6 col-md-12 col-sm-12 col-xs-12{% else %}col-lg-4 col-md-12 col-sm-12 col-xs-12{% endif %}">
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">
@@ -35,7 +35,7 @@
{% endif %}
{% if Route.getCurrentRoute.getName == 'categories.show.all' %}
{# all chart #}
<div class="{% if attachments.count == 0 %}col-lg-12 col-md-12 col-sm-12 col-xs-12{% else %}col-lg-8 col-md-12 col-sm-12 col-xs-12{% endif %}">
<div class="{% if attachments.count() == 0 %}col-lg-12 col-md-12 col-sm-12 col-xs-12{% else %}col-lg-8 col-md-12 col-sm-12 col-xs-12{% endif %}">
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">
@@ -48,7 +48,7 @@
</div>
</div>
{% endif %}
{% if attachments.count > 0 %}
{% if attachments.count() > 0 %}
<div class="col-lg-4 col-md-12 col-sm-12 col-xs-12">
<div class="box">
<div class="box-header with-border">

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

@@ -36,7 +36,7 @@
{% if account.location %}
<i class="fa fa-fw fa-map-marker"></i>
{% endif %}
{% if account.attachments.count > 0 %}
{% if account.attachments.count() > 0 %}
<i class="fa fa-fw fa-paperclip"></i>
{% endif %}
</td>

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

@@ -38,7 +38,7 @@
{% endif %}
<a href="{{ route('bills.show',entry.id) }}" title="{{ entry.name }}">{{ entry.name }}</a>
{# count attachments #}
{% if entry.attachments.count > 0 %}
{% if entry.attachments.count() > 0 %}
<i class="fa fa-paperclip"></i>
{% endif %}

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

@@ -25,7 +25,7 @@
</td>
<td data-value="{{ category.name }}">
<a href="{{ route('categories.show', category.id) }}" title="{{ category.name }}">{{ category.name }}</a>
{% if category.attachments.count > 0 %}
{% if category.attachments.count() > 0 %}
<i class="fa fa-fw fa-paperclip"></i>
{% endif %}
</td>

2
resources/views/v1/list/piggy-banks.twig
View File

@@ -41,7 +41,7 @@
</td>
<td>
<a href="{{ route('piggy-banks.show', piggy.id) }}" title="{{ piggy.account_name }}">{{ piggy.name }}</a>
{% if piggy.attachments.count > 0 %}
{% if piggy.attachments.count() > 0 %}
<i class="fa fa-fw fa-paperclip"></i>
{% endif %}

2
resources/views/v1/piggy-banks/show.twig
View File

@@ -117,7 +117,7 @@
</div>
{% endif %}
{% if attachments.count > 0 %}
{% if attachments.count() > 0 %}
<div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">
<div class="box">
<div class="box-header with-border">

6
resources/views/v1/rules/index.twig
View File

@@ -55,7 +55,7 @@
<em>{{ ruleGroup.description }}</em>
</p>
{% if ruleGroup.rules.count > 0 %}
{% if ruleGroup.rules.count() > 0 %}
<table class="table table-hover table-striped group-rules">
<thead>
<tr>
@@ -120,7 +120,7 @@
<small><br />{% if rule.strict %}<span class="text-danger">{{ 'rule_is_strict'|_ }}</span>{% else %}<span class="text-success">{{ 'rule_is_not_strict'|_ }}</span>{% endif %}</small>
</td>
<td class="hidden-xs">
{% if rule.ruleTriggers.count > 0 %}
{% if rule.ruleTriggers.count() > 0 %}
<ul class="small" data-id="{{ rule.id }}">
{% for trigger in rule.ruleTriggers %}
{% if trigger.trigger_type != "user_action" %}
@@ -141,7 +141,7 @@
{% endif %}
</td>
<td class="hidden-xs">
{% if rule.ruleActions.count > 0 %}
{% if rule.ruleActions.count() > 0 %}
<ul class="small" data-id="{{ rule.id }}">
{% for action in rule.ruleActions %}
<li

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

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

4
resources/views/v1/tags/delete.twig
View File

@@ -24,8 +24,8 @@
</p>
<p>
{% if tag.transactionjournals.count > 0 %}
{{ Lang.choice('form.tag_keep_transactions', tag.transactionjournals.count, {count: tag.transactionjournals.count}) }}
{% if tag.transactionjournals.count() > 0 %}
{{ Lang.choice('form.tag_keep_transactions', tag.transactionjournals.count(), {count: tag.transactionjournals.count()}) }}
{% endif %}
</p>
</div>

2
resources/views/v1/tags/index.twig
View File

@@ -37,7 +37,7 @@
style="font-weight: normal;font-size:0.9em;"
title="{{ tagInfo.created_at.formatLocalized(monthAndDayFormat) }}"
href="{{ route('tags.show',tagInfo.id) }}">{% if tagInfo.location %}<i class="fa fa-fw fa-map-marker"></i>{% endif %}<i class="fa fa-fw fa-tag"></i>{{ tagInfo.tag }}{% if tagInfo.attachments.count > 0 %}<i class="fa fa-fw fa-paperclip"></i>{% endif %}</a></div>
href="{{ route('tags.show',tagInfo.id) }}">{% if tagInfo.location %}<i class="fa fa-fw fa-map-marker"></i>{% endif %}<i class="fa fa-fw fa-tag"></i>{{ tagInfo.tag }}{% if tagInfo.attachments.count() > 0 %}<i class="fa fa-fw fa-paperclip"></i>{% endif %}</a></div>
{% endfor %}
</div>

2
resources/views/v1/tags/show.twig
View File

@@ -203,7 +203,7 @@
</div>
</div>
</div>
{% if attachments.count > 0 %}
{% if attachments.count() > 0 %}
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="box">