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

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

@@ -119,7 +119,7 @@ class CreateController extends Controller
// put previous url in session if not redirect from store (not "create another").
if (true !== session('accounts.create.fromStore')) {
$this->rememberPreviousUri('accounts.create.uri');
$this->rememberPreviousUrl('accounts.create.url');
}
$request->session()->forget('accounts.create.fromStore');
Log::channel('audit')->info('Creating new account.');
@@ -171,7 +171,7 @@ class CreateController extends Controller
}
// redirect to previous URL.
$redirect = redirect($this->getPreviousUri('accounts.create.uri'));
$redirect = redirect($this->getPreviousUrl('accounts.create.url'));
if (1 === (int) $request->get('create_another')) {
// set value so create routine will not overwrite URL:
$request->session()->put('accounts.create.fromStore', true);

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

@@ -82,7 +82,7 @@ class DeleteController extends Controller
unset($accountList[$account->id]);
// put previous url in session
$this->rememberPreviousUri('accounts.delete.uri');
$this->rememberPreviousUrl('accounts.delete.url');
return view('accounts.delete', compact('account', 'subTitle', 'accountList', 'objectType'));
}
@@ -111,7 +111,7 @@ class DeleteController extends Controller
$request->session()->flash('success', (string) trans(sprintf('firefly.%s_deleted', $typeName), ['name' => $name]));
app('preferences')->mark();
return redirect($this->getPreviousUri('accounts.delete.uri'));
return redirect($this->getPreviousUrl('accounts.delete.url'));
}
}

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

@@ -118,7 +118,7 @@ class EditController extends Controller
// put previous url in session if not redirect from store (not "return_to_edit").
if (true !== session('accounts.edit.fromUpdate')) {
$this->rememberPreviousUri('accounts.edit.uri');
$this->rememberPreviousUrl('accounts.edit.url');
}
$request->session()->forget('accounts.edit.fromUpdate');
@@ -211,7 +211,7 @@ class EditController extends Controller
}
// redirect
$redirect = redirect($this->getPreviousUri('accounts.edit.uri'));
$redirect = redirect($this->getPreviousUrl('accounts.edit.url'));
if (1 === (int) $request->get('return_to_edit')) {
// set value so edit routine will not overwrite URL:
$request->session()->put('accounts.edit.fromUpdate', true);

12
app/Http/Controllers/Account/ReconcileController.php
View File

@@ -134,9 +134,9 @@ class ReconcileController extends Controller
$subTitle = (string) trans('firefly.reconcile_account', ['account' => $account->name]);
// various links
$transactionsUri = route('accounts.reconcile.transactions', [$account->id, '%start%', '%end%']);
$overviewUri = route('accounts.reconcile.overview', [$account->id, '%start%', '%end%']);
$indexUri = route('accounts.reconcile', [$account->id, '%start%', '%end%']);
$transactionsUrl = route('accounts.reconcile.transactions', [$account->id, '%start%', '%end%']);
$overviewUrl = route('accounts.reconcile.overview', [$account->id, '%start%', '%end%']);
$indexUrl = route('accounts.reconcile', [$account->id, '%start%', '%end%']);
$objectType = 'asset';
return view(
@@ -151,9 +151,9 @@ class ReconcileController extends Controller
'subTitle',
'startBalance',
'endBalance',
'transactionsUri',
'overviewUri',
'indexUri'
'transactionsUrl',
'overviewUrl',
'indexUrl'
)
);
}

8
app/Http/Controllers/Account/ShowController.php
View File

@@ -114,7 +114,7 @@ class ShowController extends Controller
$fStart = $start->isoFormat($this->monthAndDayFormat);
$fEnd = $end->isoFormat($this->monthAndDayFormat);
$subTitle = (string) trans('firefly.journals_in_period_for_account', ['name' => $account->name, 'start' => $fStart, 'end' => $fEnd]);
$chartUri = route('chart.account.period', [$account->id, $start->format('Y-m-d'), $end->format('Y-m-d')]);
$chartUrl = route('chart.account.period', [$account->id, $start->format('Y-m-d'), $end->format('Y-m-d')]);
$firstTransaction = $this->repository->oldestJournalDate($account) ?? $start;
$periods = $this->getAccountPeriodOverview($account, $firstTransaction, $end);
@@ -152,7 +152,7 @@ class ShowController extends Controller
'subTitle',
'start',
'end',
'chartUri',
'chartUrl',
'location',
'balance'
)
@@ -194,7 +194,7 @@ class ShowController extends Controller
$collector->setAccounts(new Collection([$account]))->setLimit($pageSize)->setPage($page)->withAccountInformation()->withCategoryInformation();
$groups = $collector->getPaginatedGroups();
$groups->setPath(route('accounts.show.all', [$account->id]));
$chartUri = route('chart.account.period', [$account->id, $start->format('Y-m-d'), $end->format('Y-m-d')]);
$chartUrl = route('chart.account.period', [$account->id, $start->format('Y-m-d'), $end->format('Y-m-d')]);
$showAll = true;
$balance = app('steam')->balance($account, $end);
@@ -209,7 +209,7 @@ class ShowController extends Controller
'attachments',
'currency',
'today',
'chartUri',
'chartUrl',
'periods',
'subTitleIcon',
'groups',