graphql-python/graphene
1
1
Fork 0
mirror of https://github.com/graphql-python/graphene.git synced 2024-11-23 10:03:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Django integration

Browse Source
This commit is contained in:
Syrus Akbary 2016-08-22 01:03:20 -07:00
parent d17bd0aa3e
commit 9109b9de90
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
graphene-django/graphene_django/types.py
View File

@ -2,14 +2,14 @@ from collections import OrderedDict
import six import six
from graphene import ObjectType from graphene import ObjectType, Field
from graphene.types.objecttype import ObjectTypeMeta from graphene.types.objecttype import ObjectTypeMeta
from .converter import convert_django_field_with_choices from .converter import convert_django_field_with_choices
from graphene.types.options import Options from graphene.types.options import Options
from .utils import get_model_fields, is_valid_django_model, DJANGO_FILTER_INSTALLED from .utils import get_model_fields, is_valid_django_model, DJANGO_FILTER_INSTALLED
from .registry import Registry, get_global_registry from .registry import Registry, get_global_registry
from graphene.utils.is_base_type import is_base_type from graphene.utils.is_base_type import is_base_type
from graphene.types.utils import get_fields_in_type, merge from graphene.types.utils import yank_fields_from_attrs, merge
def construct_fields(options): def construct_fields(options):
@ -80,9 +80,9 @@ class DjangoObjectTypeMeta(ObjectTypeMeta):
options.registry.register(cls) options.registry.register(cls)
options.django_fields = get_fields_in_type( options.django_fields = yank_fields_from_attrs(
ObjectType, construct_fields(options),
construct_fields(options) _as=Field,
) )
options.fields = merge( options.fields = merge(
options.interface_fields, options.interface_fields,