From 8bb55ed79daae2c51e448de2730dac5c46709f22 Mon Sep 17 00:00:00 2001
From: momamene <momamene@gmail.com>
Date: Tue, 13 Dec 2016 13:23:08 +0000
Subject: [PATCH 1/2] Get name of reverse_fields from model.__dict__

---
 graphene_django/types.py |  3 +--
 graphene_django/utils.py | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/graphene_django/types.py b/graphene_django/types.py
index 8174f05b9..76622f7a7 100644
--- a/graphene_django/types.py
+++ b/graphene_django/types.py
@@ -21,8 +21,7 @@ def construct_fields(options):
     exclude_fields = options.exclude_fields
 
     fields = OrderedDict()
-    for field in _model_fields:
-        name = field.name
+    for name, field in _model_fields:
         is_not_in_only = only_fields and name not in options.only_fields
         is_already_created = name in options.fields
         is_excluded = name in exclude_fields or is_already_created
diff --git a/graphene_django/utils.py b/graphene_django/utils.py
index a58db3e97..7b4cd2113 100644
--- a/graphene_django/utils.py
+++ b/graphene_django/utils.py
@@ -30,11 +30,11 @@ def get_reverse_fields(model):
             # Hack for making it compatible with Django 1.6
             new_related = RelatedObject(related.parent_model, related.model, related.field)
             new_related.name = name
-            yield new_related
+            yield (name, new_related)
         elif isinstance(related, models.ManyToOneRel):
-            yield related
+            yield (name, related)
         elif isinstance(related, models.ManyToManyRel) and not related.symmetrical:
-            yield related
+            yield (name, related)
 
 
 def maybe_queryset(value):
@@ -45,8 +45,13 @@ def maybe_queryset(value):
 
 def get_model_fields(model):
     reverse_fields = get_reverse_fields(model)
-    all_fields = sorted(list(model._meta.fields) +
-                        list(model._meta.local_many_to_many))
+    all_fields = [
+        (field.name, field)
+        for field
+        in sorted(list(model._meta.fields) +
+                  list(model._meta.local_many_to_many))
+    ]
+
     all_fields += list(reverse_fields)
 
     return all_fields

From 45542b6a93fb411db0f46494bc18003ab962fdd7 Mon Sep 17 00:00:00 2001
From: momamene <momamene@gmail.com>
Date: Wed, 14 Dec 2016 12:13:11 +0000
Subject: [PATCH 2/2] Remove meaningless guard

---
 graphene_django/types.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/graphene_django/types.py b/graphene_django/types.py
index 76622f7a7..b6e4b5ece 100644
--- a/graphene_django/types.py
+++ b/graphene_django/types.py
@@ -33,8 +33,6 @@ def construct_fields(options):
             # Or when there is no back reference.
             continue
         converted = convert_django_field_with_choices(field, options.registry)
-        if not converted:
-            continue
         fields[name] = converted
 
     return fields