kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-04-30 01:55:47 +00:00
Code Issues Projects Releases Wiki Activity

Display first recipe by default on recipes page

Browse Source
This commit is contained in:
Bernd Bestel 2018-07-15 10:16:36 +02:00
parent ea0f5101ec
commit 37dee2a50b
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
controllers/RecipesController.php
View File

@ -16,6 +16,8 @@ class RecipesController 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)
{ {
$recipes = $this->Database->recipes()->orderBy('name');
$selectedRecipe = null; $selectedRecipe = null;
$selectedRecipePositions = null; $selectedRecipePositions = null;
if (isset($request->getQueryParams()['recipe'])) if (isset($request->getQueryParams()['recipe']))
@ -23,9 +25,17 @@ class RecipesController extends BaseController
$selectedRecipe = $this->Database->recipes($request->getQueryParams()['recipe']); $selectedRecipe = $this->Database->recipes($request->getQueryParams()['recipe']);
$selectedRecipePositions = $this->Database->recipes_pos()->where('recipe_id', $request->getQueryParams()['recipe']); $selectedRecipePositions = $this->Database->recipes_pos()->where('recipe_id', $request->getQueryParams()['recipe']);
} }
else
{
foreach ($recipes as $recipe)
{
$selectedRecipe = $recipe;
$selectedRecipePositions = $this->Database->recipes_pos()->where('recipe_id', $recipe->id);
}
}
return $this->AppContainer->view->render($response, 'recipes', [ return $this->AppContainer->view->render($response, 'recipes', [
'recipes' => $this->Database->recipes()->orderBy('name'), 'recipes' => $recipes,
'recipesFulfillment' => $this->RecipesService->GetRecipesFulfillment(), 'recipesFulfillment' => $this->RecipesService->GetRecipesFulfillment(),
'recipesSumFulfillment' => $this->RecipesService->GetRecipesSumFulfillment(), 'recipesSumFulfillment' => $this->RecipesService->GetRecipesSumFulfillment(),
'selectedRecipe' => $selectedRecipe, 'selectedRecipe' => $selectedRecipe,

6
public/viewjs/recipes.js
View File

@ -8,7 +8,11 @@
'scrollY': false, 'scrollY': false,
'colReorder': true, 'colReorder': true,
'stateSave': true, 'stateSave': true,
'select': 'single' 'select': 'single',
'initComplete': function()
{
this.api().row({ order: 'current' }, 0).select();
}
}); });
var rowSelect = GetUriParam("row"); var rowSelect = GetUriParam("row");