kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-12 09:52:20 +00:00
Code Issues Projects Releases Wiki Activity

Catch link error.

Browse Source
This commit is contained in:
James Cole
2017-08-24 19:42:23 +02:00
parent 829d3680d9
commit c37ade8f5b
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,13 +83,6 @@ class LinkController extends Controller
return redirect(strval(session('journal_links.delete.uri'))); return redirect(strval(session('journal_links.delete.uri')));
} }
public function switch(LinkTypeRepositoryInterface $repository, TransactionJournalLink $link) {
$repository->switchLink($link);
return redirect(URL::previous());
}
/** /**
* @param JournalLinkRequest $request * @param JournalLinkRequest $request
* @param LinkTypeRepositoryInterface $repository * @param LinkTypeRepositoryInterface $repository
@@ -127,7 +120,13 @@ class LinkController extends Controller
$linkJournalId = intval($request->string('link_other')); $linkJournalId = intval($request->string('link_other'));
} }
$opposing = $journalRepository->find($linkJournalId); $opposing = $journalRepository->find($linkJournalId);
if (is_null($opposing->id)) {
Session::flash('error', trans('firefly.invalid_link_data'));
return redirect(route('transactions.show', $journal->id));
}
$result = $repository->findLink($journal, $opposing); $result = $repository->findLink($journal, $opposing);
if ($result) { if ($result) {
Session::flash('error', trans('firefly.journals_error_linked')); Session::flash('error', trans('firefly.journals_error_linked'));
@@ -155,4 +154,12 @@ class LinkController extends Controller
return redirect(route('transactions.show', $journal->id)); return redirect(route('transactions.show', $journal->id));
} }
public function switch(LinkTypeRepositoryInterface $repository, TransactionJournalLink $link)
{
$repository->switchLink($link);
return redirect(URL::previous());
}
} }