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

Merge branch 'develop' into feature/vue3

Browse Source 
# Conflicts:
#	.gitignore
#	recipes/settings.py
This commit is contained in:
vabene1111
2024-12-30 14:48:10 +01:00
parent c1bfa563a3 fd4236672e
commit 830ce14c65
6 changed files with 35 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vue/src/components/ShoppingLineItem.vue
View File

@@ -238,7 +238,7 @@ export default {
if (e.recipe_mealplan !== null) {
let recipe_name = e.recipe_mealplan.recipe_name
if (recipes.indexOf(recipe_name) === -1) {
if (recipes.indexOf(recipe_name) === -1 && recipe_name !== undefined) {
recipes.push(recipe_name.substring(0, 14) + (recipe_name.length > 14 ? '..' : ''))
}