basic shopping list fix

cookbook/models.py

@@ -189,6 +189,9 @@ class Recipe(models.Model):
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
 
+    def __str__(self):
+        return self.name
+
 
 class Comment(models.Model):
     recipe = models.ForeignKey(Recipe, on_delete=models.CASCADE)

cookbook/templates/shopping_list.html

@@ -26,7 +26,7 @@
     <div class="row">
         <div class="col col-md-12">
             <!--// @formatter:off-->
-            <textarea id="id_list" class="form-control" rows="{{ ingredients|length|add:1 }}">{% for i in ingredients %}{% if markdown_format %}- [ ] {% endif %}{{ i.amount.normalize }} {{ i.unit }} {{ i.ingredient.name }}&#13;&#10;{% endfor %}</textarea>
+            <textarea id="id_list" class="form-control" rows="{{ ingredients|length|add:1 }}">{% for i in ingredients %}{% if markdown_format %}- [ ] {% endif %}{{ i.amount.normalize }} {{ i.unit }} {{ i.food.name }}&#13;&#10;{% endfor %}</textarea>
             <!--// @formatter:on-->
         </div>
     </div>

cookbook/views/views.py

@@ -189,10 +189,11 @@ def shopping_list(request):
     ingredients = []
 
     for r in recipes:
-        for ri in RecipeIngredient.objects.filter(recipe=r).exclude(unit__name__contains='Special:').all():
+        for s in r.steps.all():
+            for ri in s.ingredients.exclude(unit__name__contains='Special:').all():
                 index = None
                 for x, ig in enumerate(ingredients):
-                if ri.ingredient == ig.ingredient and ri.unit == ig.unit:
+                    if ri.food == ig.food and ri.unit == ig.unit:
                         index = x
 
                 if index: