From d97fd73ce56c3b01103bc8d14231a1d07714d5c7 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 22 Sep 2020 16:19:51 +0200 Subject: [PATCH] Make sure notes always have a value, even when null #3823 --- resources/views/v1/accounts/show.twig | 2 +- resources/views/v1/bills/show.twig | 2 +- resources/views/v1/list/attachments.twig | 2 +- resources/views/v1/piggy-banks/show.twig | 2 +- resources/views/v1/rules/index.twig | 2 +- resources/views/v1/transactions/show.twig | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/views/v1/accounts/show.twig b/resources/views/v1/accounts/show.twig index 9744a83cdf..b4dd5f18a5 100644 --- a/resources/views/v1/accounts/show.twig +++ b/resources/views/v1/accounts/show.twig @@ -122,7 +122,7 @@

{{ 'notes'|_ }}

- {{ account.notes.first.text|markdown }} + {{ account.notes.first.text|default('')|markdown }}
diff --git a/resources/views/v1/bills/show.twig b/resources/views/v1/bills/show.twig index 7efc81111f..594ac11a26 100644 --- a/resources/views/v1/bills/show.twig +++ b/resources/views/v1/bills/show.twig @@ -110,7 +110,7 @@

{{ 'notes'|_ }}

- {{ object.data.notes|markdown }} + {{ object.data.notes|default('')|markdown }}
{% endif %} diff --git a/resources/views/v1/list/attachments.twig b/resources/views/v1/list/attachments.twig index a287e31911..271b9a0371 100644 --- a/resources/views/v1/list/attachments.twig +++ b/resources/views/v1/list/attachments.twig @@ -28,7 +28,7 @@ ({{ attachment.size|filesize }}) {% if null != attachment.notes and '' != attachment.notes %} - {{ attachment.notes|markdown }} + {{ attachment.notes|default('')|markdown }} {% endif %} {% endif %} {% if not attachment.file_exists %} diff --git a/resources/views/v1/piggy-banks/show.twig b/resources/views/v1/piggy-banks/show.twig index 100e99feda..7401539b6e 100644 --- a/resources/views/v1/piggy-banks/show.twig +++ b/resources/views/v1/piggy-banks/show.twig @@ -111,7 +111,7 @@

{{ trans('form.notes') }}

-
{{ piggy.notes|markdown }} +
{{ piggy.notes|default('')|markdown }}
diff --git a/resources/views/v1/rules/index.twig b/resources/views/v1/rules/index.twig index 0bb763b408..0298a2fc89 100644 --- a/resources/views/v1/rules/index.twig +++ b/resources/views/v1/rules/index.twig @@ -115,7 +115,7 @@ {% if not rule.active %} class="text-muted" {% endif %} - >
{{ rule.description|markdown }} + >
{{ rule.description|default('')|markdown }} {% endif %}
{% if rule.strict %}{{ 'rule_is_strict'|_ }}{% else %}{{ 'rule_is_not_strict'|_ }}{% endif %}
diff --git a/resources/views/v1/transactions/show.twig b/resources/views/v1/transactions/show.twig index ffddb9f9a9..70fbf99cd2 100644 --- a/resources/views/v1/transactions/show.twig +++ b/resources/views/v1/transactions/show.twig @@ -311,7 +311,7 @@ {% if null != journal.notes and '' != journal.notes %} {{ trans('list.notes') }} - {{ journal.notes|markdown }} + {{ journal.notes|default('')|markdown }} {% endif %} {% if journalHasMeta(journal.transaction_journal_id, 'recurring_total') and journalHasMeta(journal.transaction_journal_id, 'recurring_count') %}