Make examples diff better against each other

pull/454/head
Eric L Frederich 4 years ago
parent 1755948768
commit a97729d362
  1. 2
      examples/cookbook-plain/README.md
  2. 2
      examples/cookbook-plain/cookbook/ingredients/tests.py
  3. 2
      examples/cookbook-plain/cookbook/ingredients/views.py
  4. 1
      examples/cookbook-plain/cookbook/recipes/models.py
  5. 2
      examples/cookbook-plain/cookbook/recipes/tests.py
  6. 2
      examples/cookbook-plain/cookbook/recipes/views.py
  7. 8
      examples/cookbook/cookbook/ingredients/admin.py
  8. 2
      examples/cookbook/cookbook/ingredients/models.py
  9. 6
      examples/cookbook/cookbook/recipes/admin.py
  10. 1
      examples/cookbook/cookbook/recipes/models.py
  11. 4
      examples/cookbook/cookbook/schema.py
  12. 1
      examples/cookbook/cookbook/settings.py
  13. 1
      examples/cookbook/cookbook/urls.py
  14. 2
      examples/cookbook/setup.cfg

@ -3,7 +3,7 @@ Cookbook Example Django Project
This example project demos integration between Graphene and Django.
The project contains two apps, one named `ingredients` and another
named `recepies`.
named `recipes`.
Getting started
---------------

@ -6,6 +6,7 @@ from cookbook.ingredients.models import Ingredient
class Recipe(models.Model):
title = models.CharField(max_length=100)
instructions = models.TextField()
__unicode__ = lambda self: self.title
class RecipeIngredient(models.Model):

@ -2,9 +2,11 @@ from django.contrib import admin
from cookbook.ingredients.models import Category, Ingredient
@admin.register(Ingredient)
class IngredientAdmin(admin.ModelAdmin):
list_display = ("id","name","category")
list_editable = ("name","category")
list_display = ('id', 'name', 'category')
list_editable = ('name', 'category')
admin.site.register(Category)

@ -10,7 +10,7 @@ class Category(models.Model):
class Ingredient(models.Model):
name = models.CharField(max_length=100)
notes = models.TextField(null=True,blank=True)
notes = models.TextField(null=True, blank=True)
category = models.ForeignKey(Category, related_name='ingredients')
def __str__(self):

@ -2,9 +2,11 @@ from django.contrib import admin
from cookbook.recipes.models import Recipe, RecipeIngredient
class RecipeIngredientInline(admin.TabularInline):
model = RecipeIngredient
model = RecipeIngredient
@admin.register(Recipe)
class RecipeAdmin(admin.ModelAdmin):
inlines = [RecipeIngredientInline]
inlines = [RecipeIngredientInline]

@ -8,6 +8,7 @@ class Recipe(models.Model):
instructions = models.TextField()
__unicode__ = lambda self: self.title
class RecipeIngredient(models.Model):
recipe = models.ForeignKey(Recipe, related_name='amounts')
ingredient = models.ForeignKey(Ingredient, related_name='used_by')

@ -5,7 +5,9 @@ import graphene
from graphene_django.debug import DjangoDebug
class Query(cookbook.recipes.schema.Query, cookbook.ingredients.schema.Query, graphene.ObjectType):
class Query(cookbook.ingredients.schema.Query,
cookbook.recipes.schema.Query,
graphene.ObjectType):
debug = graphene.Field(DjangoDebug, name='__debug')

@ -1,3 +1,4 @@
# flake8: noqa
"""
Django settings for cookbook project.

@ -3,6 +3,7 @@ from django.contrib import admin
from graphene_django.views import GraphQLView
urlpatterns = [
url(r'^admin/', admin.site.urls),
url(r'^graphql', GraphQLView.as_view(graphiql=True)),

@ -0,0 +1,2 @@
[flake8]
exclude=migrations,.git,__pycache__
Loading…
Cancel
Save