Recipes page performance optimizations (references #1750)

This commit is contained in:
Bernd Bestel 2022-01-16 15:48:49 +01:00
parent dfc274643f
commit 3b3f079754
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300

View File

@ -71,7 +71,6 @@ class RecipesController extends BaseController
$recipesResolved = $this->getRecipesService()->GetRecipesResolved('recipe_id > 0'); $recipesResolved = $this->getRecipesService()->GetRecipesResolved('recipe_id > 0');
$selectedRecipe = null; $selectedRecipe = null;
if (isset($request->getQueryParams()['recipe'])) if (isset($request->getQueryParams()['recipe']))
{ {
$selectedRecipe = $this->getDatabase()->recipes($request->getQueryParams()['recipe']); $selectedRecipe = $this->getDatabase()->recipes($request->getQueryParams()['recipe']);
@ -96,7 +95,7 @@ class RecipesController extends BaseController
$renderArray = [ $renderArray = [
'recipes' => $recipes, 'recipes' => $recipes,
'recipesResolved' => $recipesResolved, '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, 'selectedRecipe' => $selectedRecipe,
'products' => $this->getDatabase()->products(), 'products' => $this->getDatabase()->products(),
'quantityUnits' => $this->getDatabase()->quantity_units(), 'quantityUnits' => $this->getDatabase()->quantity_units(),
@ -153,8 +152,6 @@ class RecipesController extends BaseController
'mode' => $recipeId == 'new' ? 'create' : 'edit', 'mode' => $recipeId == 'new' ? 'create' : 'edit',
'products' => $this->getDatabase()->products()->orderBy('name', 'COLLATE NOCASE'), 'products' => $this->getDatabase()->products()->orderBy('name', 'COLLATE NOCASE'),
'quantityunits' => $this->getDatabase()->quantity_units(), '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'), 'recipes' => $this->getDatabase()->recipes()->where('type', RecipesService::RECIPE_TYPE_NORMAL)->orderBy('name', 'COLLATE NOCASE'),
'recipeNestings' => $this->getDatabase()->recipes_nestings()->where('recipe_id', $recipeId), 'recipeNestings' => $this->getDatabase()->recipes_nestings()->where('recipe_id', $recipeId),
'userfields' => $this->getUserfieldsService()->GetFields('recipes'), 'userfields' => $this->getUserfieldsService()->GetFields('recipes'),