IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-12-24 16:10:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Make it easier to switch between v1/v2 layout.

Browse Source
This commit is contained in:
James Cole 2021-02-01 06:47:33 +01:00
parent f16b7c4286
commit b8340ddb59
No known key found for this signature in database
GPG Key ID: B5669F9493CDE38D
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
bootstrap/app.php
View File

@ -83,19 +83,22 @@ if (!function_exists('prefixView')) {
if (func_num_args() === 0) {
return $factory;
}
// original view:
$prefixView = $view;
if (
true === env('APP_DEBUG', false)
&& null !== $view
&& is_string($view)) {
// do something with view:
// try to find the view file first:
if(!$factory->exists($prefixView)) {
// prepend it with the view in the layout:
$layout = env('FIREFLY_III_LAYOUT', 'v1');
$prefixView = sprintf('%s/%s', $layout, $view);
if(false ===$factory->exists($prefixView)) {
// fall back to v1.
$prefixView = sprintf('%s/%s', 'v1', $view);
$prefixView = sprintf('%s.%s', $layout, $view);
// try again:
if(!$factory->exists($prefixView)) {
// if does not exist, force v1 and just continue.
$prefixView = sprintf('%s.%s', 'v1', $view);
}
}
return $factory->make($prefixView, $data, $mergeData);
}
}