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

Make sure notes always have a value, even when null #3823

Browse Source
This commit is contained in:
James Cole 2020-09-22 16:19:51 +02:00
parent 1624abd9ed
commit d97fd73ce5
No known key found for this signature in database
GPG Key ID: B5669F9493CDE38D
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,7 +122,7 @@
<h3 class="box-title">{{ 'notes'|_ }}</h3>
</div>
<div class="box-body">
{{ account.notes.first.text|markdown }}
{{ account.notes.first.text|default('')|markdown }}
</div>
</div>
</div>

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

@ -110,7 +110,7 @@
<h3 class="box-title">{{ 'notes'|_ }}</h3>
</div>
<div class="box-body">
{{ object.data.notes|markdown }}
{{ object.data.notes|default('')|markdown }}
</div>
</div>
{% endif %}

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

@ -28,7 +28,7 @@
</a>
({{ attachment.size|filesize }})
{% if null != attachment.notes and '' != attachment.notes %}
{{ attachment.notes|markdown }}
{{ attachment.notes|default('')|markdown }}
{% endif %}
{% endif %}
{% if not attachment.file_exists %}

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

@ -111,7 +111,7 @@
<div class="box-header with-border">
<h3 class="box-title">{{ trans('form.notes') }}</h3>
</div>
<div class="box-body markdown">{{ piggy.notes|markdown }}
<div class="box-body markdown">{{ piggy.notes|default('')|markdown }}
</div>
</div>

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

@ -115,7 +115,7 @@
{% if not rule.active %}
class="text-muted"
{% endif %}
><br/>{{ rule.description|markdown }}</small>
><br/>{{ rule.description|default('')|markdown }}</small>
{% endif %}
<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>

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

@ -311,7 +311,7 @@
{% if null != journal.notes and '' != journal.notes %}
<tr>
<td>{{ trans('list.notes') }}</td>
<td class="markdown">{{ journal.notes|markdown }}</td>
<td class="markdown">{{ journal.notes|default('')|markdown }}</td>
</tr>
{% endif %}
{% if journalHasMeta(journal.transaction_journal_id, 'recurring_total') and journalHasMeta(journal.transaction_journal_id, 'recurring_count') %}