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

Fix #2683

Browse Source
This commit is contained in:
James Cole 2019-10-05 04:53:58 +02:00
parent e3e9e8e859
commit 67f9d23714
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Transaction/LinkController.php
View File

@ -125,7 +125,7 @@ class LinkController extends Controller
if (null === $other) { if (null === $other) {
session()->flash('error', (string)trans('firefly.invalid_link_selection')); 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); $alreadyLinked = $this->repository->findLink($journal, $other);
@ -133,13 +133,13 @@ class LinkController extends Controller
if ($other->id === $journal->id) { if ($other->id === $journal->id) {
session()->flash('error', (string)trans('firefly.journals_link_to_self')); 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) { if ($alreadyLinked) {
session()->flash('error', (string)trans('firefly.journals_error_linked')); 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)); Log::debug(sprintf('Journal is %d, opposing is %d', $journal->id, $other->id));
$this->repository->storeLink($linkInfo, $other, $journal); $this->repository->storeLink($linkInfo, $other, $journal);

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

@ -410,7 +410,7 @@
<script type="text/javascript"> <script type="text/javascript">
var modalDialogURI = '{{ route('transactions.link.modal', ['%JOURNAL%']) }}'; var modalDialogURI = '{{ route('transactions.link.modal', ['%JOURNAL%']) }}';
var acURI = '{{ route('json.autocomplete.all-journals-with-id') }}'; var acURI = '{{ route('json.autocomplete.all-journals-with-id') }}';
var groupURI = '{{ route('transactions.show',['%GROUP']) }}'; var groupURI = '{{ route('transactions.show',['%GROUP%']) }}';
</script> </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/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> <script type="text/javascript" src="v1/js/ff/transactions/show.js?v={{ FF_VERSION }}"></script>