kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-04-29 17:45:39 +00:00
Code Issues Projects Releases Wiki Activity

Fixed recipes gallery view search (fixes #1825)

Browse Source
This commit is contained in:
Bernd Bestel 2022-03-22 13:21:09 +01:00
parent 790368cdf4
commit 23f285c3fb
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog/67_UNRELEASED_xxxx-xx-xx.md
View File

@ -22,6 +22,7 @@
- Fixed that the price of the "Produces product"-product, which is added to stock on consuming a recipe, was wrong (was the recipe total costs multiplied by the serving amount instead of only the recipe total costs) - Fixed that the price of the "Produces product"-product, which is added to stock on consuming a recipe, was wrong (was the recipe total costs multiplied by the serving amount instead of only the recipe total costs)
- Fixed that calories of recipe ingredients were displayed with an indefinite number of decimal places - Fixed that calories of recipe ingredients were displayed with an indefinite number of decimal places
- Fixed that ingredient amounts were wrong for multi-nested (> 2 levels) recipes, when the included recipe used an serving amount other than 1 - Fixed that ingredient amounts were wrong for multi-nested (> 2 levels) recipes, when the included recipe used an serving amount other than 1
- Fixed that searching/filtering the recipe gallery view did not work correctly
### Meal plan ### Meal plan

4
views/recipes.blade.php
View File

@ -219,7 +219,7 @@
id="gallery"> id="gallery">
<div class="card-columns no-gutters"> <div class="card-columns no-gutters">
@foreach($recipes as $recipe) @foreach($recipes as $recipe)
<a class="discrete-link recipe-gallery-item @if(FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $recipe->id)->need_fulfilled == 1) recipe-enoughinstock @elseif(FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $recipe->id)->need_fulfilled_with_shopping_list == 1) recipe-enoughinstockwithshoppinglist @else recipe-notenoughinstock @endif" <div class="cursor-link recipe-gallery-item @if(FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $recipe->id)->need_fulfilled == 1) recipe-enoughinstock @elseif(FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $recipe->id)->need_fulfilled_with_shopping_list == 1) recipe-enoughinstockwithshoppinglist @else recipe-notenoughinstock @endif"
data-recipe-id="{{ $recipe->id }}" data-recipe-id="{{ $recipe->id }}"
href="#"> href="#">
<div id="RecipeGalleryCard-{{ $recipe->id }}" <div id="RecipeGalleryCard-{{ $recipe->id }}"
@ -252,7 +252,7 @@
</p> </p>
</div> </div>
</div> </div>
</a> </div>
@endforeach @endforeach
</div> </div>
</div> </div>