graphql-python/graphene
1
1
Fork 0
mirror of https://github.com/graphql-python/graphene.git synced 2025-02-02 12:44:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issues with relay and django models

Browse Source
This commit is contained in:
Syrus Akbary 2015-09-29 23:34:59 -07:00
parent e89eb3456e
commit a7774f0be4
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
graphene/contrib/django/fields.py
View File

@ -7,23 +7,32 @@ from graphene.core.fields import Field, LazyField
from graphene.utils import cached_property from graphene.utils import cached_property
from graphene.env import get_global_schema from graphene.env import get_global_schema
from django.db.models.query import QuerySet
def get_type_for_model(schema, model): def get_type_for_model(schema, model):
schema = schema or get_global_schema() schema = schema or get_global_schema()
types = schema.types.values() types = schema.types.values()
for _type in types: for _type in types:
type_model = getattr(_type._meta, 'model', None) type_model = hasattr(_type,'_meta') and getattr(_type._meta, 'model', None)
if model == type_model: if model == type_model:
return _type return _type
class DjangoConnectionField(relay.ConnectionField):
def wrap_resolved(self, value, instance, args, info):
if isinstance(value, QuerySet):
cls = instance.__class__
value = [cls(s) for s in value]
return value
class ConnectionOrListField(LazyField): class ConnectionOrListField(LazyField):
def get_field(self): def get_field(self):
schema = self.schema schema = self.schema
model_field = self.field_type model_field = self.field_type
field_object_type = model_field.get_object_type() field_object_type = model_field.get_object_type()
if field_object_type and issubclass(field_object_type, schema.Node): if field_object_type and issubclass(field_object_type, schema.Node):
field = relay.ConnectionField(model_field) field = DjangoConnectionField(model_field)
else: else:
field = ListField(model_field) field = ListField(model_field)
field.contribute_to_class(self.object_type, self.field_name) field.contribute_to_class(self.object_type, self.field_name)

2
graphene/relay/connections.py
View File

@ -12,7 +12,7 @@ from graphene.core.fields import NativeField
@signals.class_prepared.connect @signals.class_prepared.connect
def object_type_created(object_type): def object_type_created(object_type):
schema = object_type._meta.schema schema = object_type._meta.schema
if issubclass(object_type, schema.Node) and object_type != schema.Node: if hasattr(schema, 'Node') and issubclass(object_type, schema.Node) and object_type != schema.Node:
if object_type._meta.proxy: if object_type._meta.proxy:
return return
type_name = object_type._meta.type_name type_name = object_type._meta.type_name

4
graphene/relay/fields.py
View File

@ -15,10 +15,14 @@ class ConnectionField(Field):
super(ConnectionField, self).__init__(field_type, resolve=resolve, super(ConnectionField, self).__init__(field_type, resolve=resolve,
args=connectionArgs, description=description) args=connectionArgs, description=description)
def wrap_resolved(self, value, instance, args, info):
return value
def resolve(self, instance, args, info): def resolve(self, instance, args, info):
resolved = super(ConnectionField, self).resolve(instance, args, info) resolved = super(ConnectionField, self).resolve(instance, args, info)
if resolved: if resolved:
assert isinstance(resolved, collections.Iterable), 'Resolved value from the connection field have to be iterable' assert isinstance(resolved, collections.Iterable), 'Resolved value from the connection field have to be iterable'
resolved = self.wrap_resolved(resolved, instance, args, info)
return connectionFromArray(resolved, args) return connectionFromArray(resolved, args)
@cached_property @cached_property