kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-07-28 00:09:56 -07:00
Code Issues Projects Releases Wiki Activity

Replace uri with url

Browse Source
This commit is contained in:
James Cole
2022-04-12 18:19:30 +02:00
parent ac5c11a8d7
commit 50f87a210a
101 changed files with 449 additions and 486 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/ObjectGroup/DeleteController.php
+2 -2
View File
@@ -72,7 +72,7 @@ class DeleteController extends Controller
$piggyBanks = $objectGroup->piggyBanks()->count();
// put previous url in session
$this->rememberPreviousUri('object-groups.delete.uri');
$this->rememberPreviousUrl('object-groups.delete.url');
return view('object-groups.delete', compact('objectGroup', 'subTitle', 'piggyBanks'));
}
@@ -90,7 +90,7 @@ class DeleteController extends Controller
app('preferences')->mark();
$this->repository->destroy($objectGroup);
return redirect($this->getPreviousUri('object-groups.delete.uri'));
return redirect($this->getPreviousUrl('object-groups.delete.url'));
}
}
app/Http/Controllers/ObjectGroup/EditController.php
+2 -2
View File
@@ -75,7 +75,7 @@ class EditController extends Controller
$subTitleIcon = 'fa-pencil';
if (true !== session('object-groups.edit.fromUpdate')) {
$this->rememberPreviousUri('object-groups.edit.uri');
$this->rememberPreviousUrl('object-groups.edit.url');
}
session()->forget('object-groups.edit.fromUpdate');
@@ -98,7 +98,7 @@ class EditController extends Controller
session()->flash('success', (string) trans('firefly.updated_object_group', ['title' => $objectGroup->title]));
app('preferences')->mark();
$redirect = redirect($this->getPreviousUri('object-groups.edit.uri'));
$redirect = redirect($this->getPreviousUrl('object-groups.edit.url'));
if (1 === (int) $request->get('return_to_edit')) {