Skip to content

Commit 534f61c

Browse files
committed
Get name of reverse_fields from model.__dict__
1 parent 94bab46 commit 534f61c

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

graphene_django/types.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ def construct_fields(options):
2121
exclude_fields = options.exclude_fields
2222

2323
fields = OrderedDict()
24-
for field in _model_fields:
25-
name = field.name
24+
print(_model_fields)
25+
for name, field in _model_fields:
2626
is_not_in_only = only_fields and name not in options.only_fields
2727
is_already_created = name in options.fields
2828
is_excluded = name in exclude_fields or is_already_created

graphene_django/utils.py

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import inspect
2+
import operator
23

34
from django.db import models
45
from django.db.models.manager import Manager
@@ -30,11 +31,11 @@ def get_reverse_fields(model):
3031
# Hack for making it compatible with Django 1.6
3132
new_related = RelatedObject(related.parent_model, related.model, related.field)
3233
new_related.name = name
33-
yield new_related
34+
yield (name, new_related)
3435
elif isinstance(related, models.ManyToOneRel):
35-
yield related
36+
yield (name, related)
3637
elif isinstance(related, models.ManyToManyRel) and not related.symmetrical:
37-
yield related
38+
yield (name, related)
3839

3940

4041
def maybe_queryset(value):
@@ -45,8 +46,13 @@ def maybe_queryset(value):
4546

4647
def get_model_fields(model):
4748
reverse_fields = get_reverse_fields(model)
48-
all_fields = sorted(list(model._meta.fields) +
49-
list(model._meta.local_many_to_many))
49+
all_fields = [
50+
(field.name, field)
51+
for field
52+
in sorted(list(model._meta.fields) +
53+
list(model._meta.local_many_to_many))
54+
]
55+
5056
all_fields += list(reverse_fields)
5157

5258
return all_fields

0 commit comments

Comments
 (0)