kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-21 12:52:39 +00:00
Code Issues Projects Releases Wiki Activity

Changelog and small changes for #557)

Browse Source
This commit is contained in:
Bernd Bestel
2020-02-10 18:00:42 +01:00
parent 898ea26139
commit 6b8169a1f1
3 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
changelog/56_UNRELEASED_2020-xx-xx.md
View File

@@ -17,6 +17,7 @@
- Fixed that the recipe "fullscreen card" was not correctly displayed - Fixed that the recipe "fullscreen card" was not correctly displayed
- Fixed that nested recipes showed all ingredients of the nested recipes twice - Fixed that nested recipes showed all ingredients of the nested recipes twice
- Fixed that when displaying or consuming a recipe from the meal plan the serving amount was maybe wrong (was the one from the recipe instead the one from the meal plan entry) (thanks @kriddles) - Fixed that when displaying or consuming a recipe from the meal plan the serving amount was maybe wrong (was the one from the recipe instead the one from the meal plan entry) (thanks @kriddles)
- Fixed that the stock fulfillment counts on the recipe card were maybe wrong if that recipe was also added to the meal plan (thanks @kriddles)
### Meal plan improvements ### Meal plan improvements
- Improved that all add-dialogs can be submitted by using `ENTER` and that the next input is automatically selected after selecting a recipe/product - Improved that all add-dialogs can be submitted by using `ENTER` and that the next input is automatically selected after selecting a recipe/product

9
controllers/RecipesController.php
View File

@@ -22,14 +22,7 @@ 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)
{ {
if (isset($request->getQueryParams()['include-internal'])) $recipes = $this->Database->recipes()->where('type', RecipesService::RECIPE_TYPE_NORMAL)->orderBy('name');
{
$recipes = $this->Database->recipes()->orderBy('name');
}
else
{
$recipes = $this->Database->recipes()->where('type', RecipesService::RECIPE_TYPE_NORMAL)->orderBy('name');
}
$recipesResolved = $this->RecipesService->GetRecipesResolved(); $recipesResolved = $this->RecipesService->GetRecipesResolved();
$selectedRecipe = null; $selectedRecipe = null;

1
migrations/0098.sql
View File

@@ -1,4 +1,3 @@
DROP VIEW recipes_pos_resolved; DROP VIEW recipes_pos_resolved;
CREATE VIEW recipes_pos_resolved CREATE VIEW recipes_pos_resolved
AS AS