Skip to content

Commit 91c1278

Browse files
artofhumanphalt
authored andcommitted
Make cookbook example working on django 2 (#680)
1 parent 612ba5a commit 91c1278

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

examples/cookbook/cookbook/ingredients/models.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ def __str__(self):
1111
class Ingredient(models.Model):
1212
name = models.CharField(max_length=100)
1313
notes = models.TextField(null=True, blank=True)
14-
category = models.ForeignKey(Category, related_name="ingredients")
14+
category = models.ForeignKey(
15+
Category, related_name="ingredients", on_delete=models.CASCADE
16+
)
1517

1618
def __str__(self):
1719
return self.name

examples/cookbook/cookbook/recipes/models.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ class Recipe(models.Model):
1010

1111

1212
class RecipeIngredient(models.Model):
13-
recipe = models.ForeignKey(Recipe, related_name="amounts")
14-
ingredient = models.ForeignKey(Ingredient, related_name="used_by")
13+
recipe = models.ForeignKey(Recipe, related_name="amounts", on_delete=models.CASCADE)
14+
ingredient = models.ForeignKey(
15+
Ingredient, related_name="used_by", on_delete=models.CASCADE
16+
)
1517
amount = models.FloatField()
1618
unit = models.CharField(
1719
max_length=20,

examples/cookbook/cookbook/settings.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,12 @@
4343
"cookbook.recipes.apps.RecipesConfig",
4444
]
4545

46-
MIDDLEWARE_CLASSES = [
46+
MIDDLEWARE = [
4747
"django.middleware.security.SecurityMiddleware",
4848
"django.contrib.sessions.middleware.SessionMiddleware",
4949
"django.middleware.common.CommonMiddleware",
5050
"django.middleware.csrf.CsrfViewMiddleware",
5151
"django.contrib.auth.middleware.AuthenticationMiddleware",
52-
"django.contrib.auth.middleware.SessionAuthenticationMiddleware",
5352
"django.contrib.messages.middleware.MessageMiddleware",
5453
"django.middleware.clickjacking.XFrameOptionsMiddleware",
5554
]

examples/cookbook/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
graphene
22
graphene-django
33
graphql-core>=2.1rc1
4-
django==1.11.21
4+
django==2.2.2
55
django-filter>=2

0 commit comments

Comments
 (0)