kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-29 18:20:01 +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

4
app/Http/Controllers/RuleGroup/CreateController.php
View File

@@ -72,7 +72,7 @@ class CreateController extends Controller
// put previous url in session if not redirect from store (not "create another").
if (true !== session('rule-groups.create.fromStore')) {
$this->rememberPreviousUri('rule-groups.create.uri');
$this->rememberPreviousUrl('rule-groups.create.url');
}
session()->forget('rule-groups.create.fromStore');
@@ -94,7 +94,7 @@ class CreateController extends Controller
session()->flash('success', (string) trans('firefly.created_new_rule_group', ['title' => $ruleGroup->title]));
app('preferences')->mark();
$redirect = redirect($this->getPreviousUri('rule-groups.create.uri'));
$redirect = redirect($this->getPreviousUrl('rule-groups.create.url'));
if (1 === (int) $request->get('create_another')) {
session()->put('rule-groups.create.fromStore', true);

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

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

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

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