From 3b3f07975468265ec392e26e26f06b450892534c Mon Sep 17 00:00:00 2001 From: Bernd Bestel Date: Sun, 16 Jan 2022 15:48:49 +0100 Subject: [PATCH] Recipes page performance optimizations (references #1750) --- controllers/RecipesController.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/controllers/RecipesController.php b/controllers/RecipesController.php index bfc6507e..c78698ed 100644 --- a/controllers/RecipesController.php +++ b/controllers/RecipesController.php @@ -71,7 +71,6 @@ class RecipesController extends BaseController $recipesResolved = $this->getRecipesService()->GetRecipesResolved('recipe_id > 0'); $selectedRecipe = null; - if (isset($request->getQueryParams()['recipe'])) { $selectedRecipe = $this->getDatabase()->recipes($request->getQueryParams()['recipe']); @@ -96,7 +95,7 @@ class RecipesController extends BaseController $renderArray = [ 'recipes' => $recipes, 'recipesResolved' => $recipesResolved, - 'recipePositionsResolved' => $this->getDatabase()->recipes_pos_resolved()->where('recipe_type', RecipesService::RECIPE_TYPE_NORMAL), + 'recipePositionsResolved' => $this->getDatabase()->recipes_pos_resolved()->where('recipe_id', $selectedRecipe->id), 'selectedRecipe' => $selectedRecipe, 'products' => $this->getDatabase()->products(), 'quantityUnits' => $this->getDatabase()->quantity_units(), @@ -153,8 +152,6 @@ class RecipesController extends BaseController 'mode' => $recipeId == 'new' ? 'create' : 'edit', 'products' => $this->getDatabase()->products()->orderBy('name', 'COLLATE NOCASE'), 'quantityunits' => $this->getDatabase()->quantity_units(), - 'recipePositionsResolved' => $this->getRecipesService()->GetRecipesPosResolved(), - 'recipesResolved' => $this->getRecipesService()->GetRecipesResolved(), 'recipes' => $this->getDatabase()->recipes()->where('type', RecipesService::RECIPE_TYPE_NORMAL)->orderBy('name', 'COLLATE NOCASE'), 'recipeNestings' => $this->getDatabase()->recipes_nestings()->where('recipe_id', $recipeId), 'userfields' => $this->getUserfieldsService()->GetFields('recipes'),