github-mirror/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2026-04-07 21:26:16 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

lazy loading of users service

Browse Source
This commit is contained in:
zebardy 2019-11-23 14:43:00 +00:00
parent 8b9790417d
commit b0d602d13c
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
controllers/BaseController.php
View File

@ -72,7 +72,7 @@ class BaseController
$container->view->set('userentitiesForSidebar', $this->getDatabase()->userentities()->where('show_in_sidebar_menu = 1')->orderBy('name')); $container->view->set('userentitiesForSidebar', $this->getDatabase()->userentities()->where('show_in_sidebar_menu = 1')->orderBy('name'));
try try
{ {
$usersService = new UsersService(); $usersService = $this->getUsersService();
if (defined('GROCY_USER_ID')) if (defined('GROCY_USER_ID'))
{ {
$container->view->set('userSettings', $usersService->GetUserSettings(GROCY_USER_ID)); $container->view->set('userSettings', $usersService->GetUserSettings(GROCY_USER_ID));
@ -122,5 +122,16 @@ class BaseController
return $this->userfieldsService; return $this->userfieldsService;
} }
private $usersService = null;
protected function getUsersService()
{
if($this->usersService == null)
{
$this->usersService = new UsersService();
}
return $this->usersService;
}
protected $AppContainer; protected $AppContainer;
} }

5
controllers/BatteriesController.php
View File

@ -3,8 +3,6 @@
namespace Grocy\Controllers; namespace Grocy\Controllers;
use \Grocy\Services\BatteriesService; use \Grocy\Services\BatteriesService;
use \Grocy\Services\UsersService;
use \Grocy\Services\UserfieldsService;
class BatteriesController extends BaseController class BatteriesController extends BaseController
{ {
@ -12,7 +10,6 @@ class BatteriesController extends BaseController
{ {
parent::__construct($container); parent::__construct($container);
$this->BatteriesService = new BatteriesService(); $this->BatteriesService = new BatteriesService();
#$this->UserfieldsService = new UserfieldsService();
} }
protected $BatteriesService; protected $BatteriesService;
@ -20,7 +17,7 @@ class BatteriesController extends BaseController
public function Overview(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args) public function Overview(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
{ {
$usersService = new UsersService(); $usersService = $this->getUsersService();
$nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['batteries_due_soon_days']; $nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['batteries_due_soon_days'];
return $this->renderPage($response, 'batteriesoverview', [ return $this->renderPage($response, 'batteriesoverview', [