kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-15 00:27:30 +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/Budget/CreateController.php
View File

@@ -98,7 +98,7 @@ class CreateController extends Controller
// put previous url in session if not redirect from store (not "create another").
if (true !== session('budgets.create.fromStore')) {
$this->rememberPreviousUri('budgets.create.uri');
$this->rememberPreviousUrl('budgets.create.url');
}
$request->session()->forget('budgets.create.fromStore');
$subTitle = (string) trans('firefly.create_new_budget');
@@ -136,7 +136,7 @@ class CreateController extends Controller
$request->session()->flash('info', $this->attachments->getMessages()->get('attachments'));
}
$redirect = redirect($this->getPreviousUri('budgets.create.uri'));
$redirect = redirect($this->getPreviousUrl('budgets.create.url'));
if (1 === (int) $request->get('create_another')) {

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

@@ -73,7 +73,7 @@ class DeleteController extends Controller
$subTitle = (string) trans('firefly.delete_budget', ['name' => $budget->name]);
// put previous url in session
$this->rememberPreviousUri('budgets.delete.uri');
$this->rememberPreviousUrl('budgets.delete.url');
return view('budgets.delete', compact('budget', 'subTitle'));
}
@@ -93,7 +93,7 @@ class DeleteController extends Controller
$request->session()->flash('success', (string) trans('firefly.deleted_budget', ['name' => $name]));
app('preferences')->mark();
return redirect($this->getPreviousUri('budgets.delete.uri'));
return redirect($this->getPreviousUrl('budgets.delete.url'));
}
}

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

@@ -108,7 +108,7 @@ class EditController extends Controller
// put previous url in session if not redirect from store (not "return_to_edit").
if (true !== session('budgets.edit.fromUpdate')) {
$this->rememberPreviousUri('budgets.edit.uri');
$this->rememberPreviousUrl('budgets.edit.url');
}
$request->session()->forget('budgets.edit.fromUpdate');
$request->session()->flash('preFilled', $preFilled);
@@ -133,7 +133,7 @@ class EditController extends Controller
$this->repository->cleanupBudgets();
app('preferences')->mark();
$redirect = redirect($this->getPreviousUri('budgets.edit.uri'));
$redirect = redirect($this->getPreviousUrl('budgets.edit.url'));
// store new attachment(s):
$files = $request->hasFile('attachments') ? $request->file('attachments') : null;