kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-15 18:26:00 +00:00
Code Issues Projects Releases Wiki Activity

Simplified viewjs / active page handling

Browse Source
This commit is contained in:
Bernd Bestel
2023-05-20 18:20:30 +02:00
parent ddf0ff0aef
commit d16d976d0b
74 changed files with 77 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
controllers/BaseController.php
View File

@@ -114,7 +114,7 @@ class BaseController
return UsersService::getInstance();
}
protected function render($response, $page, $data = [])
protected function render($response, $viewName, $data = [])
{
$container = $this->AppContainer;
@@ -159,8 +159,8 @@ class BaseController
unset($constants[$constant]);
}
}
$this->View->set('featureFlags', $constants);
if (GROCY_AUTHENTICATED)
{
$this->View->set('permissions', User::PermissionList());
@@ -177,10 +177,12 @@ class BaseController
$this->View->set('DEFAULT_MIN_AMOUNT', $defaultMinAmount);
}
return $this->View->render($response, $page, $data);
$this->View->set('viewName', $viewName);
return $this->View->render($response, $viewName, $data);
}
protected function renderPage($response, $page, $data = [])
protected function renderPage($response, $viewName, $data = [])
{
$this->View->set('userentitiesForSidebar', $this->getDatabase()->userentities()->where('show_in_sidebar_menu = 1')->orderBy('name'));
try
@@ -200,7 +202,7 @@ class BaseController
// Happens when database is not initialised or migrated...
}
return $this->render($response, $page, $data);
return $this->render($response, $viewName, $data);
}
private static $htmlPurifierInstance = null;