From 3b39fb93e7d02a736e29acb388390924f3792262 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 23 Aug 2019 13:09:38 +0200
Subject: [PATCH] Fix tag overview.

---
 public/v1/js/ff/transactions/list.js      | 2 +-
 resources/views/v1/tags/show.twig         | 2 +-
 resources/views/v1/transactions/show.twig | 3 +--
 routes/breadcrumbs.php                    | 2 +-
 routes/web.php                            | 4 ++--
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/public/v1/js/ff/transactions/list.js b/public/v1/js/ff/transactions/list.js
index 46bb3639ef..c9752279a7 100644
--- a/public/v1/js/ff/transactions/list.js
+++ b/public/v1/js/ff/transactions/list.js
@@ -21,7 +21,7 @@
 /** global: edit_selected_txt, edit_bulk_selected_txt, delete_selected_txt, token */
 
 /**
- *
+ * @deprecated
  */
 $(document).ready(function () {
     "use strict";
diff --git a/resources/views/v1/tags/show.twig b/resources/views/v1/tags/show.twig
index f55ef60956..64708cfeea 100644
--- a/resources/views/v1/tags/show.twig
+++ b/resources/views/v1/tags/show.twig
@@ -188,5 +188,5 @@
     </script>
     <script src="v1/lib/leaflet/leaflet.js?v={{ FF_VERSION }}"></script>
     <script src="v1/js/ff/tags/show.js?v={{ FF_VERSION }}"></script>
-    <script type="text/javascript" src="v1/js/ff/transactions/list.js?v={{ FF_VERSION }}"></script>
+    <script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ FF_VERSION }}"></script>
 {% endblock %}
diff --git a/resources/views/v1/transactions/show.twig b/resources/views/v1/transactions/show.twig
index de26d90659..e69928d09e 100644
--- a/resources/views/v1/transactions/show.twig
+++ b/resources/views/v1/transactions/show.twig
@@ -261,8 +261,7 @@
                                     <td>
                                         {% for tag in journal.tags %}
                                             <h4 style="display: inline;"><a class="label label-success" href="{{ route('tags.show', tag) }}">
-                                                    <i class="fa fa-fw fa-tag"></i>
-                                                    {{ tag }}</a>
+                                                    <i class="fa fa-fw fa-tag"></i>{{ tag }}</a>
                                             </h4>
                                         {% endfor %}
                                     </td>
diff --git a/routes/breadcrumbs.php b/routes/breadcrumbs.php
index 46d59afc4b..93443cd5a3 100644
--- a/routes/breadcrumbs.php
+++ b/routes/breadcrumbs.php
@@ -1092,7 +1092,7 @@ try {
                 $title = limitStringLength($group->title);
             }
             if('opening balance' === $type) {
-                
+
                 $breadcrumbs->push($title, route('transactions.show', [$group->id]));
                 return;
             }
diff --git a/routes/web.php b/routes/web.php
index 624b4520e6..a3db7a4986 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -857,8 +857,8 @@ Route::group(
     Route::get('', ['uses' => 'TagController@index', 'as' => 'index']);
     Route::get('create', ['uses' => 'TagController@create', 'as' => 'create']);
 
-    Route::get('show/{tag}/all', ['uses' => 'TagController@showAll', 'as' => 'show.all']);
-    Route::get('show/{tag}/{start_date?}/{end_date?}', ['uses' => 'TagController@show', 'as' => 'show']);
+    Route::get('show/{tagOrId}/all', ['uses' => 'TagController@showAll', 'as' => 'show.all']);
+    Route::get('show/{tagOrId}/{start_date?}/{end_date?}', ['uses' => 'TagController@show', 'as' => 'show']);
 
     Route::get('edit/{tag}', ['uses' => 'TagController@edit', 'as' => 'edit']);
     Route::get('delete/{tag}', ['uses' => 'TagController@delete', 'as' => 'delete']);