From 5402319a2c78c1fa19f5953b120bf2d72e69b2fb Mon Sep 17 00:00:00 2001
From: zebardy <zebardy@gmail.com>
Date: Wed, 19 Feb 2020 01:32:30 +0000
Subject: [PATCH] bug fixes following merge

---
 controllers/BaseApiController.php | 15 ---------------
 controllers/BaseController.php    | 20 ++++++++++++++++++--
 controllers/RecipesController.php |  2 +-
 controllers/StockController.php   |  2 +-
 services/CalendarService.php      |  2 +-
 5 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/controllers/BaseApiController.php b/controllers/BaseApiController.php
index aff11fe5..f6809d96 100644
--- a/controllers/BaseApiController.php
+++ b/controllers/BaseApiController.php
@@ -38,19 +38,4 @@ class BaseApiController extends BaseController
 			'error_message' => $errorMessage
 		));
 	}
-
-	protected function getApiKeyService()
-	{
-		return ApiKeyService::getInstance();
-	}
-
-	protected function getChoresService()
-	{
-		return ChoresService::getInstance();
-	}
-
-	protected function getFilesService()
-	{
-		return FilesService::getInstance();
-	}
 }
diff --git a/controllers/BaseController.php b/controllers/BaseController.php
index d9773b3e..d4c6730e 100644
--- a/controllers/BaseController.php
+++ b/controllers/BaseController.php
@@ -13,6 +13,9 @@ use \Grocy\Services\CalendarService;
 use \Grocy\Services\SessionService;
 use \Grocy\Services\RecipesService;
 use \Grocy\Services\TasksService;
+use \Grocy\Services\FilesService;
+use \Grocy\Services\ChoresService;
+use \Grocy\Services\ApiKeyService;
 
 class BaseController
 {
@@ -144,12 +147,25 @@ class BaseController
 		return UsersService::getInstance();
 	}
 
-	private $userfieldsService = null;
-
 	protected function getUserfieldsService()
 	{
 		return UserfieldsService::getInstance();
 	}
+
+	protected function getApiKeyService()
+	{
+		return ApiKeyService::getInstance();
+	}
+
+	protected function getChoresService()
+	{
+		return ChoresService::getInstance();
+	}
+
+	protected function getFilesService()
+	{
+		return FilesService::getInstance();
+	}
 	
 	protected $AppContainer;
 }
diff --git a/controllers/RecipesController.php b/controllers/RecipesController.php
index 72a51056..b7cc073f 100644
--- a/controllers/RecipesController.php
+++ b/controllers/RecipesController.php
@@ -77,7 +77,7 @@ class RecipesController extends BaseController
 			'recipe' =>  $this->getDatabase()->recipes($recipeId),
 			'recipePositions' =>  $this->getDatabase()->recipes_pos()->where('recipe_id', $recipeId),
 			'mode' => 'edit',
-			'products' => $this->getDatabase()->products()->orderBy('name'),,
+			'products' => $this->getDatabase()->products()->orderBy('name'),
 			'quantityunits' => $this->getDatabase()->quantity_units(),
 			'recipePositionsResolved' => $this->getRecipesService()->GetRecipesPosResolved(),
 			'recipesResolved' => $this->getRecipesService()->GetRecipesResolved(),
diff --git a/controllers/StockController.php b/controllers/StockController.php
index 13466498..63c2b7d4 100644
--- a/controllers/StockController.php
+++ b/controllers/StockController.php
@@ -65,7 +65,7 @@ class StockController extends BaseController
 
 	public function Transfer(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->View->render($response, 'transfer', [
+		return $this->renderPage($response, 'transfer', [
 			'products' => $this->getDatabase()->products()->orderBy('name'),
 			'recipes' => $this->getDatabase()->recipes()->orderBy('name'),
 			'locations' => $this->getDatabase()->locations()->orderBy('name')
diff --git a/services/CalendarService.php b/services/CalendarService.php
index d653cbbb..137c02ce 100644
--- a/services/CalendarService.php
+++ b/services/CalendarService.php
@@ -107,7 +107,7 @@ class CalendarService extends BaseService
 						'title' => $titlePrefix . FindObjectInArrayByPropertyValue($recipes, 'id', $recipeOfCurrentDay->includes_recipe_id)->name,
 						'start' => FindObjectInArrayByPropertyValue($recipes, 'id', $recipeOfCurrentDay->recipe_id)->name,
 						'date_format' => 'date',
-						'description' => $this->getUrlManager()->ConstructUrl('/mealplan' . '?week=' . FindObjectInArrayByPropertyValue($recipes, 'id', $recipeOfCurrentDay->recipe_id)->name)
+						'description' => $this->UrlManager()->ConstructUrl('/mealplan' . '?week=' . FindObjectInArrayByPropertyValue($recipes, 'id', $recipeOfCurrentDay->recipe_id)->name)
 					);
 				}
 			}