mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-03 05:11:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/vue3

Browse Source 
# Conflicts:
#	.env.template
#	cookbook/views/views.py
#	requirements.txt
This commit is contained in:
vabene1111
2024-07-09 07:26:11 +02:00
parent 08309a6f04 c4ff29beda
commit 930e686cbd
87 changed files with 3469 additions and 3170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cookbook/views/api.py
View File

@@ -896,7 +896,7 @@ class IngredientViewSet(viewsets.ModelViewSet):
if unit and re.match(r'^(\d)+$', unit):
queryset = queryset.filter(unit_id=unit)
return queryset
return queryset.select_related('food')
@extend_schema_view(list=extend_schema(parameters=[