From 67f9d23714382a23d862f02230b2709a75e0187d Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 5 Oct 2019 04:53:58 +0200
Subject: [PATCH] Fix #2683

---
 app/Http/Controllers/Transaction/LinkController.php | 6 +++---
 resources/views/v1/transactions/show.twig           | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Transaction/LinkController.php b/app/Http/Controllers/Transaction/LinkController.php
index c6fc354789..4ca76f1c65 100644
--- a/app/Http/Controllers/Transaction/LinkController.php
+++ b/app/Http/Controllers/Transaction/LinkController.php
@@ -125,7 +125,7 @@ class LinkController extends Controller
         if (null === $other) {
             session()->flash('error', (string)trans('firefly.invalid_link_selection'));
 
-            return redirect(route('transactions.show', [$journal->id]));
+            return redirect(route('transactions.show', [$journal->transaction_group_id]));
         }
 
         $alreadyLinked = $this->repository->findLink($journal, $other);
@@ -133,13 +133,13 @@ class LinkController extends Controller
         if ($other->id === $journal->id) {
             session()->flash('error', (string)trans('firefly.journals_link_to_self'));
 
-            return redirect(route('transactions.show', [$journal->id]));
+            return redirect(route('transactions.show', [$journal->transaction_group_id]));
         }
 
         if ($alreadyLinked) {
             session()->flash('error', (string)trans('firefly.journals_error_linked'));
 
-            return redirect(route('transactions.show', [$journal->id]));
+            return redirect(route('transactions.show', [$journal->transaction_group_id]));
         }
         Log::debug(sprintf('Journal is %d, opposing is %d', $journal->id, $other->id));
         $this->repository->storeLink($linkInfo, $other, $journal);
diff --git a/resources/views/v1/transactions/show.twig b/resources/views/v1/transactions/show.twig
index 05413055ea..eacfb53926 100644
--- a/resources/views/v1/transactions/show.twig
+++ b/resources/views/v1/transactions/show.twig
@@ -410,7 +410,7 @@
     <script type="text/javascript">
         var modalDialogURI = '{{ route('transactions.link.modal', ['%JOURNAL%']) }}';
         var acURI = '{{ route('json.autocomplete.all-journals-with-id') }}';
-        var groupURI = '{{ route('transactions.show',['%GROUP']) }}';
+        var groupURI = '{{ route('transactions.show',['%GROUP%']) }}';
     </script>
     <script type="text/javascript" src="v1/js/lib/typeahead/typeahead.bundle.min.js?v={{ FF_VERSION }}"></script>
     <script type="text/javascript" src="v1/js/ff/transactions/show.js?v={{ FF_VERSION }}"></script>