kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-16 01:06:46 +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

9
app/Http/Controllers/AttachmentController.php
View File

@@ -22,7 +22,6 @@ use Illuminate\Http\Response as LaravelResponse;
use Preferences;
use Response;
use Session;
use URL;
use View;
/**
@@ -63,7 +62,7 @@ class AttachmentController extends Controller
$subTitle = trans('firefly.delete_attachment', ['name' => $attachment->filename]);
// put previous url in session
Session::put('attachments.delete.url', URL::previous());
$this->rememberPreviousUri('attachments.delete.uri');
Session::flash('gaEventCategory', 'attachments');
Session::flash('gaEventAction', 'delete-attachment');
@@ -85,7 +84,7 @@ class AttachmentController extends Controller
Session::flash('success', strval(trans('firefly.attachment_deleted', ['name' => $name])));
Preferences::mark();
return redirect(session('attachments.delete.url'));
return redirect($this->getPreviousUri('attachments.delete.uri'));
}
/**
@@ -131,7 +130,7 @@ class AttachmentController extends Controller
// put previous url in session if not redirect from store (not "return_to_edit").
if (session('attachments.edit.fromUpdate') !== true) {
Session::put('attachments.edit.url', URL::previous());
$this->rememberPreviousUri('attachments.edit.uri');
}
Session::forget('attachments.edit.fromUpdate');
@@ -181,7 +180,7 @@ class AttachmentController extends Controller
}
// redirect to previous URL.
return redirect(session('attachments.edit.url'));
return redirect($this->getPreviousUri('attachments.edit.uri'));
}