kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00: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

10
app/Http/Controllers/Rule/CreateController.php
View File

@@ -122,7 +122,7 @@ class CreateController extends Controller
// put previous url in session if not redirect from store (not "create another").
if (true !== session('rules.create.fromStore')) {
$this->rememberPreviousUri('rules.create.uri');
$this->rememberPreviousUrl('rules.create.url');
}
session()->forget('rules.create.fromStore');
@@ -175,7 +175,7 @@ class CreateController extends Controller
// put previous url in session if not redirect from store (not "create another").
if (true !== session('rules.create.fromStore')) {
$this->rememberPreviousUri('rules.create.uri');
$this->rememberPreviousUrl('rules.create.url');
}
session()->forget('rules.create.fromStore');
@@ -225,7 +225,7 @@ class CreateController extends Controller
// put previous url in session if not redirect from store (not "create another").
if (true !== session('rules.create.fromStore')) {
$this->rememberPreviousUri('rules.create.uri');
$this->rememberPreviousUrl('rules.create.url');
}
session()->forget('rules.create.fromStore');
@@ -272,10 +272,10 @@ class CreateController extends Controller
// redirect to new bill creation.
if ((int) $request->get('bill_id') > 0) {
return redirect($this->getPreviousUri('bills.create.uri'));
return redirect($this->getPreviousUrl('bills.create.url'));
}
$redirect = redirect($this->getPreviousUri('rules.create.uri'));
$redirect = redirect($this->getPreviousUrl('rules.create.url'));
if (1 === (int) $request->get('create_another')) {

4
app/Http/Controllers/Rule/DeleteController.php
View File

@@ -71,7 +71,7 @@ class DeleteController extends Controller
$subTitle = (string) trans('firefly.delete_rule', ['title' => $rule->title]);
// put previous url in session
$this->rememberPreviousUri('rules.delete.uri');
$this->rememberPreviousUrl('rules.delete.url');
return view('rules.rule.delete', compact('rule', 'subTitle'));
}
@@ -91,7 +91,7 @@ class DeleteController extends Controller
session()->flash('success', (string) trans('firefly.deleted_rule', ['title' => $title]));
app('preferences')->mark();
return redirect($this->getPreviousUri('rules.delete.uri'));
return redirect($this->getPreviousUrl('rules.delete.url'));
}
}

4
app/Http/Controllers/Rule/EditController.php
View File

@@ -127,7 +127,7 @@ class EditController extends Controller
// put previous url in session if not redirect from store (not "return_to_edit").
if (true !== session('rules.edit.fromUpdate')) {
$this->rememberPreviousUri('rules.edit.uri');
$this->rememberPreviousUrl('rules.edit.url');
}
session()->forget('rules.edit.fromUpdate');
@@ -193,7 +193,7 @@ class EditController extends Controller
session()->flash('success', (string) trans('firefly.updated_rule', ['title' => $rule->title]));
app('preferences')->mark();
$redirect = redirect($this->getPreviousUri('rules.edit.uri'));
$redirect = redirect($this->getPreviousUrl('rules.edit.url'));
if (1 === (int) $request->get('return_to_edit')) {
session()->put('rules.edit.fromUpdate', true);