From b8893bcad74f809e94e2a0788c37f8e892da5800 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 30 Jun 2018 05:54:23 +0200
Subject: [PATCH] Fix bulk editor.

---
 resources/views/transactions/bulk/edit.twig | 14 ++------------
 resources/views/transactions/show.twig      | 10 +---------
 2 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/resources/views/transactions/bulk/edit.twig b/resources/views/transactions/bulk/edit.twig
index ce587d65ac..53697d1f95 100644
--- a/resources/views/transactions/bulk/edit.twig
+++ b/resources/views/transactions/bulk/edit.twig
@@ -40,18 +40,8 @@
                                                 {{ journal.description }}</a></td>
                                             <td>{{ journal|journalTotalAmount }}</td>
                                             <td>{{ journal.date.formatLocalized(monthAndDayFormat) }}</td>
-                                            <td>
-                                                {% set cat = journal.categories.first %}
-                                                {% if cat %}
-                                                    <a href="{{ route('categories.show', [cat.id]) }}">{{ cat.name }}</a>
-                                                {% endif %}
-                                            </td>
-                                            <td>
-                                                {% set bud = journal.budgets.first %}
-                                                {% if bud %}
-                                                    <a href="{{ route('budgets.show', [bud.id]) }}">{{ bud.name }}</a>
-                                                {% endif %}
-                                            </td>
+                                            <td>{{ journalCategories(journal)|raw }}</td>
+                                            <td>{{ journalBudgets(journal)|raw }}</td>
                                             <td>
                                                 {% for tag in journal.tags %}
                                                     <a class="label label-success" href="{{ route('tags.show', [tag.id]) }}">
diff --git a/resources/views/transactions/show.twig b/resources/views/transactions/show.twig
index 439c29f036..f184c82dbe 100644
--- a/resources/views/transactions/show.twig
+++ b/resources/views/transactions/show.twig
@@ -238,15 +238,7 @@
                                     {% for tag in journal.tags %}
 
                                         <h4 style="display: inline;"><a class="label label-success" href="{{ route('tags.show',tag) }}">
-                                                {% if tag.tagMode == 'nothing' %}
-                                                    <i class="fa fa-fw fa-tag"></i>
-                                                {% endif %}
-                                                {% if tag.tagMode == 'balancingAct' %}
-                                                    <i class="fa fa-fw fa-refresh"></i>
-                                                {% endif %}
-                                                {% if tag.tagMode == 'advancePayment' %}
-                                                    <i class="fa fa-fw fa-sort-numeric-desc"></i>
-                                                {% endif %}
+                                                <i class="fa fa-fw fa-tag"></i>
                                                 {{ tag.tag }}</a>
                                         </h4>
                                     {% endfor %}