From ec03017eca0cf8991b21a18c7cd3d3d5f3c8cc44 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 21 Apr 2021 06:23:12 +0200 Subject: [PATCH] Fix possible issue with tag display in bulk editor. --- app/Helpers/Collector/GroupCollector.php | 2 +- resources/views/v1/transactions/bulk/edit.twig | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Helpers/Collector/GroupCollector.php b/app/Helpers/Collector/GroupCollector.php index 7f8ed23b72..961781e091 100644 --- a/app/Helpers/Collector/GroupCollector.php +++ b/app/Helpers/Collector/GroupCollector.php @@ -699,7 +699,7 @@ class GroupCollector implements GroupCollectorInterface $result = $this->convertToInteger($result); $result['reconciled'] = 1 === (int)$result['reconciled']; - if (array_key_exists('tag_id', $result)) { // assume the other fields are present as well. + if (array_key_exists('tag_id', $result) && null !== $result['tag_id']) { // assume the other fields are present as well. $tagId = (int)$augumentedJournal['tag_id']; $tagDate = null; try { diff --git a/resources/views/v1/transactions/bulk/edit.twig b/resources/views/v1/transactions/bulk/edit.twig index 0d59c01f2a..5711041cda 100644 --- a/resources/views/v1/transactions/bulk/edit.twig +++ b/resources/views/v1/transactions/bulk/edit.twig @@ -76,8 +76,8 @@ {% for tag in journal.tags %} - {% if null != tag.name %} - + {% if 0 != tag.id %} + {{ tag.name }}