From ae05dee1528cbe77a51fb37e7b5dff9e87538cec Mon Sep 17 00:00:00 2001 From: Semyon Pupkov Date: Tue, 18 Jun 2019 23:32:49 +0500 Subject: [PATCH] Make cookbook example working on django 2 --- examples/cookbook/cookbook/ingredients/models.py | 4 +++- examples/cookbook/cookbook/recipes/models.py | 6 ++++-- examples/cookbook/cookbook/settings.py | 3 +-- examples/cookbook/requirements.txt | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/examples/cookbook/cookbook/ingredients/models.py b/examples/cookbook/cookbook/ingredients/models.py index 6426dab..1e97226 100644 --- a/examples/cookbook/cookbook/ingredients/models.py +++ b/examples/cookbook/cookbook/ingredients/models.py @@ -11,7 +11,9 @@ class Category(models.Model): class Ingredient(models.Model): name = models.CharField(max_length=100) notes = models.TextField(null=True, blank=True) - category = models.ForeignKey(Category, related_name="ingredients") + category = models.ForeignKey( + Category, related_name="ingredients", on_delete=models.CASCADE + ) def __str__(self): return self.name diff --git a/examples/cookbook/cookbook/recipes/models.py b/examples/cookbook/cookbook/recipes/models.py index b98664c..0bfb434 100644 --- a/examples/cookbook/cookbook/recipes/models.py +++ b/examples/cookbook/cookbook/recipes/models.py @@ -10,8 +10,10 @@ class Recipe(models.Model): class RecipeIngredient(models.Model): - recipe = models.ForeignKey(Recipe, related_name="amounts") - ingredient = models.ForeignKey(Ingredient, related_name="used_by") + recipe = models.ForeignKey(Recipe, related_name="amounts", on_delete=models.CASCADE) + ingredient = models.ForeignKey( + Ingredient, related_name="used_by", on_delete=models.CASCADE + ) amount = models.FloatField() unit = models.CharField( max_length=20, diff --git a/examples/cookbook/cookbook/settings.py b/examples/cookbook/cookbook/settings.py index ed41a65..7eb9d56 100644 --- a/examples/cookbook/cookbook/settings.py +++ b/examples/cookbook/cookbook/settings.py @@ -43,13 +43,12 @@ INSTALLED_APPS = [ "cookbook.recipes.apps.RecipesConfig", ] -MIDDLEWARE_CLASSES = [ +MIDDLEWARE = [ "django.middleware.security.SecurityMiddleware", "django.contrib.sessions.middleware.SessionMiddleware", "django.middleware.common.CommonMiddleware", "django.middleware.csrf.CsrfViewMiddleware", "django.contrib.auth.middleware.AuthenticationMiddleware", - "django.contrib.auth.middleware.SessionAuthenticationMiddleware", "django.contrib.messages.middleware.MessageMiddleware", "django.middleware.clickjacking.XFrameOptionsMiddleware", ] diff --git a/examples/cookbook/requirements.txt b/examples/cookbook/requirements.txt index 9d13a82..ccece5c 100644 --- a/examples/cookbook/requirements.txt +++ b/examples/cookbook/requirements.txt @@ -1,5 +1,5 @@ graphene graphene-django graphql-core>=2.1rc1 -django==1.11.21 +django==2.2.2 django-filter>=2