kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-18 02:03:40 +00:00
Code Issues Projects Releases Wiki Activity

This fixes #549

Browse Source
This commit is contained in:
James Cole
2017-02-05 08:26:54 +01:00
parent b68d5c4374
commit 3e510bd3f6
15 changed files with 118 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/Transaction/SplitController.php
View File

@@ -30,7 +30,6 @@ use Log;
use Preferences;
use Session;
use Steam;
use URL;
use View;
/**
@@ -107,7 +106,7 @@ class SplitController extends Controller
// put previous url in session if not redirect from store (not "return_to_edit").
if (session('transactions.edit-split.fromUpdate') !== true) {
Session::put('transactions.edit-split.url', URL::previous());
$this->rememberPreviousUri('transactions.edit-split.uri');
}
Session::forget('transactions.edit-split.fromUpdate');
@@ -139,7 +138,7 @@ class SplitController extends Controller
$data = $this->arrayFromInput($request);
$journal = $repository->updateSplitJournal($journal, $data);
/** @var array $files */
$files = $request->hasFile('attachments') ? $request->file('attachments') : null;
$files = $request->hasFile('attachments') ? $request->file('attachments') : null;
// save attachments:
$this->attachments->saveAttachmentsForModel($journal, $files);
@@ -163,8 +162,7 @@ class SplitController extends Controller
}
// redirect to previous URL.
return redirect(session('transactions.edit-split.url'));
return redirect($this->getPreviousUri('transactions.edit-split.uri'));
}
/**