Skip to content

Commit dbbfa33

Browse files
author
Ernesto Pérez Amigo
authored
Add files via upload
repair conflict on converter.py, by the use of get_related_model function with: OneToOneRel, ManyToManyRel and ManyToOneRel
1 parent b68ce1b commit dbbfa33

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

graphene_django_extras/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from .pagination import LimitOffsetGraphqlPagination, PageGraphqlPagination, CursorGraphqlPagination
88
from .types import DjangoObjectType, DjangoInputObjectType, DjangoPaginatedObjectListType
99

10-
VERSION = (0, 0, 1, 'beta', 4)
10+
VERSION = (0, 0, 1, 'beta', 5)
1111

1212
__version__ = get_version(VERSION)
1313

graphene_django_extras/converter.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ def convert_time_to_string(field, registry=None, input_flag=False):
175175

176176
@convert_django_field.register(models.OneToOneRel)
177177
def convert_onetoone_field_to_djangomodel(field, registry=None, input_flag=None):
178-
model = get_related_model(field)
178+
model = field.related_model
179179

180180
def dynamic_type():
181181
if input_flag:
@@ -218,7 +218,7 @@ def dynamic_type():
218218
@convert_django_field.register(models.ManyToManyRel)
219219
@convert_django_field.register(models.ManyToOneRel)
220220
def convert_many_rel_to_djangomodel(field, registry=None, input_flag=None):
221-
model = get_related_model(field)
221+
model = field.related_model
222222
if isinstance(field, models.ManyToManyRel):
223223
for f in field.related_model._meta.many_to_many:
224224
if f.rel.name == field.name and f.rel.model == field.model:

0 commit comments

Comments
 (0)