From a3f5efdd5b4c7f7fc54dc02452ce314c4b36f7d0 Mon Sep 17 00:00:00 2001 From: zebardy Date: Tue, 18 Feb 2020 23:40:58 +0000 Subject: [PATCH] bug fixes following merge --- controllers/BaseController.php | 29 +++++++++++++---------------- controllers/StockApiController.php | 2 +- controllers/StockController.php | 6 +++--- 3 files changed, 17 insertions(+), 20 deletions(-) diff --git a/controllers/BaseController.php b/controllers/BaseController.php index b47df852..e00bbbfa 100644 --- a/controllers/BaseController.php +++ b/controllers/BaseController.php @@ -13,6 +13,7 @@ class BaseController public function __construct(\DI\Container $container) { $this->AppContainer = $container; + $this->View = $container->get('view'); } protected function render($response, $page, $data = []) @@ -20,21 +21,21 @@ class BaseController $container = $this->AppContainer; $versionInfo = $this->getApplicationService()->GetInstalledVersion(); - $container->view->set('version', $versionInfo->Version); - $container->view->set('releaseDate', $versionInfo->ReleaseDate); + $this->View->set('version', $versionInfo->Version); + $this->View->set('releaseDate', $versionInfo->ReleaseDate); $localizationService = $this->getLocalizationService(); - $container->view->set('__t', function(string $text, ...$placeholderValues) use($localizationService) + $this->View->set('__t', function(string $text, ...$placeholderValues) use($localizationService) { return $localizationService->__t($text, $placeholderValues); }); - $container->view->set('__n', function($number, $singularForm, $pluralForm) use($localizationService) + $this->View->set('__n', function($number, $singularForm, $pluralForm) use($localizationService) { return $localizationService->__n($number, $singularForm, $pluralForm); }); - $container->view->set('GettextPo', $localizationService->GetPoAsJsonString()); + $this->View->set('GettextPo', $localizationService->GetPoAsJsonString()); - $container->view->set('U', function($relativePath, $isResource = false) use($container) + $this->View->set('U', function($relativePath, $isResource = false) use($container) { return $container->get('UrlManager')->ConstructUrl($relativePath, $isResource); }); @@ -44,7 +45,7 @@ class BaseController { $embedded = true; } - $container->view->set('embedded', $embedded); + $this->View->set('embedded', $embedded); $constants = get_defined_constants(); foreach ($constants as $constant => $value) @@ -54,27 +55,24 @@ class BaseController unset($constants[$constant]); } } - $container->view->set('featureFlags', $constants); + $this->View->set('featureFlags', $constants); - $this->AppContainer = $container; - - return $this->AppContainer->view->render($response, $page, $data); + return $this->View->render($response, $page, $data); } protected function renderPage($response, $page, $data = []) { - $container = $this->AppContainer; - $container->view->set('userentitiesForSidebar', $this->getDatabase()->userentities()->where('show_in_sidebar_menu = 1')->orderBy('name')); + $this->View->set('userentitiesForSidebar', $this->getDatabase()->userentities()->where('show_in_sidebar_menu = 1')->orderBy('name')); try { $usersService = $this->getUsersService(); if (defined('GROCY_USER_ID')) { - $container->view->set('userSettings', $usersService->GetUserSettings(GROCY_USER_ID)); + $this->View->set('userSettings', $usersService->GetUserSettings(GROCY_USER_ID)); } else { - $container->view->set('userSettings', null); + $this->View->set('userSettings', null); } } catch (\Exception $ex) @@ -82,7 +80,6 @@ class BaseController // Happens when database is not initialised or migrated... } - $this->AppContainer = $container; return $this->render($response, $page, $data); } diff --git a/controllers/StockApiController.php b/controllers/StockApiController.php index 651b7f81..d8b1967d 100644 --- a/controllers/StockApiController.php +++ b/controllers/StockApiController.php @@ -89,7 +89,7 @@ class StockApiController extends BaseApiController } $bookingId = $this->getStockService()->AddProduct($args['productId'], $requestBody['amount'], $bestBeforeDate, $transactionType, date('Y-m-d'), $price, $locationId); - return $this->ApiResponse($response $this->getDatabase()->stock_log($bookingId)); + return $this->ApiResponse($response, $this->getDatabase()->stock_log($bookingId)); } catch (\Exception $ex) { diff --git a/controllers/StockController.php b/controllers/StockController.php index 02351b73..a9dd13aa 100644 --- a/controllers/StockController.php +++ b/controllers/StockController.php @@ -43,7 +43,7 @@ class StockController extends BaseController $nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['stock_expring_soon_days']; return $this->AppContainer->view($response, 'stockentries', [ - 'products' => $this->getDatabase(()->products()->orderBy('name'), + 'products' => $this->getDatabase()->products()->orderBy('name'), 'quantityunits' => $this->getDatabase()->quantity_units()->orderBy('name'), 'locations' => $this->getDatabase()->locations()->orderBy('name'), 'stockEntries' => $this->getDatabase()->stock()->orderBy('product_id'), @@ -73,7 +73,7 @@ class StockController extends BaseController public function Transfer(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) { - return $this->AppContainer->view->render($response, 'transfer', [ + return $this->View->render($response, 'transfer', [ 'products' => $this->getDatabase()->products()->orderBy('name'), 'recipes' => $this->getDatabase()->recipes()->orderBy('name'), 'locations' => $this->getDatabase()->locations()->orderBy('name') @@ -90,7 +90,7 @@ class StockController extends BaseController public function StockEntryEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) { - return $this->AppContainer->view->render($response, 'stockentryform', [ + return $this->View->render($response, 'stockentryform', [ 'stockEntry' => $this->getDatabase()->stock()->where('id', $args['entryId'])->fetch(), 'products' => $this->getDatabase()->products()->orderBy('name'), 'locations' => $this->getDatabase()->locations()->orderBy('name')