kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-16 22:58:09 +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

14
app/Http/Controllers/CurrencyController.php
View File

@@ -88,7 +88,7 @@ class CurrencyController extends Controller
// put previous url in session if not redirect from store (not "create another").
if (true !== session('currencies.create.fromStore')) {
$this->rememberPreviousUri('currencies.create.uri');
$this->rememberPreviousUrl('currencies.create.url');
}
$request->session()->forget('currencies.create.fromStore');
@@ -157,7 +157,7 @@ class CurrencyController extends Controller
}
// put previous url in session
$this->rememberPreviousUri('currencies.delete.uri');
$this->rememberPreviousUrl('currencies.delete.url');
$subTitle = (string) trans('form.delete_currency', ['name' => $currency->name]);
Log::channel('audit')->info(sprintf('Visit page to delete currency %s.', $currency->code));
@@ -204,7 +204,7 @@ class CurrencyController extends Controller
$request->session()->flash('success', (string) trans('firefly.deleted_currency', ['name' => $currency->name]));
return redirect($this->getPreviousUri('currencies.delete.uri'));
return redirect($this->getPreviousUrl('currencies.delete.url'));
}
/**
@@ -297,7 +297,7 @@ class CurrencyController extends Controller
// put previous url in session if not redirect from store (not "return_to_edit").
if (true !== session('currencies.edit.fromUpdate')) {
$this->rememberPreviousUri('currencies.edit.uri');
$this->rememberPreviousUrl('currencies.edit.url');
}
$request->session()->forget('currencies.edit.fromUpdate');
@@ -375,7 +375,7 @@ class CurrencyController extends Controller
Log::error('User ' . auth()->user()->id . ' is not admin, but tried to store a currency.');
Log::channel('audit')->info('Tried to create (POST) currency without admin rights.', $data);
return redirect($this->getPreviousUri('currencies.create.uri'));
return redirect($this->getPreviousUrl('currencies.create.url'));
}
@@ -388,7 +388,7 @@ class CurrencyController extends Controller
$request->session()->flash('error', (string) trans('firefly.could_not_store_currency'));
$currency = null;
}
$redirect = redirect($this->getPreviousUri('currencies.create.uri'));
$redirect = redirect($this->getPreviousUrl('currencies.create.url'));
if (null !== $currency) {
$request->session()->flash('success', (string) trans('firefly.created_currency', ['name' => $currency->name]));
@@ -443,6 +443,6 @@ class CurrencyController extends Controller
}
return redirect($this->getPreviousUri('currencies.edit.uri'));
return redirect($this->getPreviousUrl('currencies.edit.url'));
}
}