Merge pull request #50 from Sebastien-M/GH-34

django admin recipe delete bug fix

food2/app/migrations/0002_auto_20190522_2149.py

@@ -0,0 +1,37 @@
+# Generated by Django 2.2.1 on 2019-05-22 21:49
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('app', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='dailyrecipe',
+            name='recipe',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE,
+                                    related_name='daily_recipe', to='app.Recipe'),
+        ),
+        migrations.AlterField(
+            model_name='dailyrecipe',
+            name='user',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='daily_recipe',
+                                    to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AlterField(
+            model_name='ingredientrecipe',
+            name='ingredient',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='app.Ingredient'),
+        ),
+        migrations.AlterField(
+            model_name='shoppinglistitem',
+            name='user',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='shopping_list',
+                                    to=settings.AUTH_USER_MODEL),
+        ),
+    ]

food2/app/migrations/0003_auto_20190522_2151.py

@@ -0,0 +1,19 @@
+# Generated by Django 2.2.1 on 2019-05-22 21:51
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('app', '0002_auto_20190522_2149'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='ingredientrecipe',
+            name='recipe',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='ingredient_quantity',
+                                    to='app.Recipe'),
+        ),
+    ]

food2/app/models.py

@@ -32,26 +32,26 @@ class Meta:
     def __str__(self):
         return '{} - {}'.format(self.recipe.name, self.ingredient.name)
 
-    ingredient = models.ForeignKey(Ingredient, on_delete='cascade')
-    recipe = models.ForeignKey(Recipe, on_delete='cascade', related_name='ingredient_quantity')
+    ingredient = models.ForeignKey(Ingredient, on_delete=models.CASCADE)
+    recipe = models.ForeignKey(Recipe, on_delete=models.CASCADE, related_name='ingredient_quantity')
     quantity = models.FloatField(blank=True, null=True)
 
 
 class DailyRecipe(models.Model):
     class Meta:
         unique_together = (('user', 'day'),)
 
-    user = models.ForeignKey(User, related_name='daily_recipe', on_delete='cascade')
+    user = models.ForeignKey(User, related_name='daily_recipe', on_delete=models.CASCADE)
     day = models.DateField(default=timezone.now, db_index=True)
-    recipe = models.ForeignKey(Recipe, on_delete='cascade', related_name='daily_recipe', unique=False, blank=True,
+    recipe = models.ForeignKey(Recipe, on_delete=models.CASCADE, related_name='daily_recipe', unique=False, blank=True,
                                null=True)
 
     def __str__(self):
         return '{} - {}'.format(self.user.username, str(self.day))
 
 
 class ShoppingListItem(models.Model):
-    user = models.ForeignKey(User, related_name='shopping_list', on_delete='cascade')
+    user = models.ForeignKey(User, related_name='shopping_list', on_delete=models.CASCADE)
     ingredient = models.CharField(max_length=255)
     quantity = models.CharField(max_length=10, null=True, blank=True)
     bought = models.BooleanField(default=False, blank=True, null=True)