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

Fixed tests.

Browse Source
This commit is contained in:
Markus Padourek 2016-06-13 15:39:12 +01:00
parent 2a99904101
commit 6f8b03d2d8
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
graphene/relay/fields.py
View File

@ -29,7 +29,7 @@ class ConnectionField(Field):
@with_context @with_context
def resolver(self, instance, args, context, info): def resolver(self, instance, args, context, info):
schema = info.schema.graphene_schema schema = info.schema.graphene_schema
connection_type = self.get_type(schema) connection_type_for_node = self.get_type(schema)
resolver = super(ConnectionField, self).resolver resolver = super(ConnectionField, self).resolver
if has_context(resolver): if has_context(resolver):
@ -37,17 +37,18 @@ class ConnectionField(Field):
else: else:
resolved = super(ConnectionField, self).resolver(instance, args, info) resolved = super(ConnectionField, self).resolver(instance, args, info)
if isinstance(resolved, connection_type): if isinstance(resolved, self.connection_type):
return resolved return resolved
return self.from_list(connection_type, resolved, args, context, info)
return self.from_list(connection_type_for_node, resolved, args, context, info)
def from_list(self, connection_type, resolved, args, context, info): def from_list(self, connection_type, resolved, args, context, info):
return connection_type.from_list(resolved, args, context, info) return connection_type.from_list(resolved, args, context, info)
def get_connection_type(self, node): def get_connection_type(self, node):
connection_type = self.connection_type or node.get_connection_type() connection_type = self.connection_type or node.get_connection_type()
edge_type = self.get_edge_type(node) self.connection_type = connection_type
return connection_type.for_node(node, edge_type=edge_type) return connection_type.for_node(node)
def get_edge_type(self, node): def get_edge_type(self, node):
edge_type = self.edge_type or node.get_edge_type() edge_type = self.edge_type or node.get_edge_type()
@ -59,9 +60,9 @@ class ConnectionField(Field):
node = schema.objecttype(type) node = schema.objecttype(type)
assert is_node(node), 'Only nodes have connections.' assert is_node(node), 'Only nodes have connections.'
schema.register(node) schema.register(node)
connection_type = self.get_connection_type(node) connection_type_for_node = self.get_connection_type(node)
return connection_type return connection_type_for_node
class NodeField(Field): class NodeField(Field):