Merge branch 'master' into recursive-nodes

Author: tangerilli

README.md

@@ -58,6 +58,7 @@ To create a GraphQL schema for it you simply have to write the following:
 
 ```python
 from graphene_django import DjangoObjectType
+import graphene
 
 class User(DjangoObjectType):
     class Meta:
@@ -106,3 +107,21 @@ After developing, the full test suite can be evaluated by running:
 ```sh
 python setup.py test # Use --pytest-args="-v -s" for verbose mode
 ```
+
+
+### Documentation
+
+The documentation is generated using the excellent [Sphinx](http://www.sphinx-doc.org/) and a custom theme.
+
+The documentation dependencies are installed by running:
+
+```sh
+cd docs
+pip install -r requirements.txt
+```
+
+Then to produce a HTML version of the documentation:
+
+```sh
+make html
+```

README.rst

@@ -68,6 +68,7 @@ following:
 .. code:: python
 
     from graphene_django import DjangoObjectType
+    import graphene
 
     class User(DjangoObjectType):
         class Meta:
@@ -116,6 +117,25 @@ After developing, the full test suite can be evaluated by running:
 
     python setup.py test # Use --pytest-args="-v -s" for verbose mode
 
+Documentation
+~~~~~~~~~~~~~
+
+The documentation can be generated using the excellent
+`Sphinx <http://www.sphinx-doc.org/>`__ and a custom theme.
+
+To install the documentation dependencies, run the following:
+
+.. code:: sh
+
+    cd docs
+    pip install -r requirements.txt
+
+Then to produce a HTML version of the documentation:
+
+.. code:: sh
+
+    make html
+
 .. |Graphene Logo| image:: http://graphene-python.org/favicon.png
 .. |Build Status| image:: https://travis-ci.org/graphql-python/graphene-django.svg?branch=master
    :target: https://travis-ci.org/graphql-python/graphene-django

docs/requirements.txt

@@ -1,2 +1,3 @@
+sphinx
 # Docs template
 https://github.com/graphql-python/graphene-python.org/archive/docs.zip

docs/tutorial.rst

@@ -188,6 +188,8 @@ And then add the ``SCHEMA`` to the ``GRAPHENE`` config in ``cookbook/settings.py
         'SCHEMA': 'cookbook.schema.schema'
     }
 
+Alternatively, we can specify the schema to be used in the urls definition,
+as explained below.
 
 Creating GraphQL and GraphiQL views
 -----------------------------------
@@ -199,6 +201,22 @@ view.
 This view will serve as GraphQL endpoint. As we want to have the
 aforementioned GraphiQL we specify that on the params with ``graphiql=True``.
 
+.. code:: python
+
+    from django.conf.urls import url, include
+    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)),
+    ]
+
+
+If we didn't specify the target schema in the Django settings file
+as explained above, we can do so here using:
+
 .. code:: python
 
     from django.conf.urls import url, include
@@ -210,7 +228,7 @@ aforementioned GraphiQL we specify that on the params with ``graphiql=True``.
 
     urlpatterns = [
         url(r'^admin/', admin.site.urls),
-        url(r'^graphql', GraphQLView.as_view(graphiql=True)),
+        url(r'^graphql', GraphQLView.as_view(graphiql=True, schema=schema)),
     ]
 
 Apply model changes to database

examples/cookbook/README.md

@@ -60,5 +60,5 @@ Now you should be ready to start the server:
 Now head on over to
 [http://127.0.0.1:8000/graphql](http://127.0.0.1:8000/graphql)
 and run some queries!
-(See the [Django quickstart guide](http://graphene-python.org/docs/quickstart-django/)
+(See the [Graphene-Django Tutorial](http://docs.graphene-python.org/projects/django/en/latest/tutorial.html#testing-our-graphql-schema)
 for some example queries)

examples/cookbook/cookbook/ingredients/admin.py

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

examples/cookbook/cookbook/ingredients/migrations/0002_auto_20161104_0050.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9 on 2016-11-04 00:50
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ingredients', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='ingredient',
+            name='notes',
+            field=models.TextField(blank=True, null=True),
+        ),
+    ]

examples/cookbook/cookbook/ingredients/models.py

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

examples/cookbook/cookbook/ingredients/schema.py

@@ -1,5 +1,5 @@
 from cookbook.ingredients.models import Category, Ingredient
-from graphene import AbstractType, Field, Node
+from graphene import AbstractType, Node
 from graphene_django.filter import DjangoFilterConnectionField
 from graphene_django.types import DjangoObjectType
 
@@ -31,8 +31,8 @@ class Meta:
 
 
 class Query(AbstractType):
-    category = Field(CategoryNode)
+    category = Node.Field(CategoryNode)
     all_categories = DjangoFilterConnectionField(CategoryNode)
 
-    ingredient = Field(IngredientNode)
+    ingredient = Node.Field(IngredientNode)
     all_ingredients = DjangoFilterConnectionField(IngredientNode)

examples/cookbook/cookbook/recipes/admin.py

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