Merge branch 'develop' into feature/vue3

# Conflicts:
#	.env.template
#	cookbook/views/views.py
#	requirements.txt
This commit is contained in:
vabene1111
2024-07-09 07:26:11 +02:00
87 changed files with 3469 additions and 3170 deletions

View File

@@ -373,8 +373,8 @@ def parse_servings(servings):
servings = 1
elif isinstance(servings, list):
try:
servings = int(re.findall(r'\b\d+\b', servings[0])[0])
except KeyError:
servings = int(re.findall(r'\b\d+\b', str(servings[0]))[0])
except (KeyError, IndexError):
servings = 1
return servings