Merge branch 'rapilabs-master'

wolph · Apr 3, 2015 · df4c06c · df4c06c
2 parents d7e7493 + 5bb932f
commit df4c06c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/django_admin_generator/management/commands/admin_generator.py b/django_admin_generator/management/commands/admin_generator.py
@@ -159,7 +159,9 @@ def name(self):
     def _process_many_to_many(self, meta):
         raw_id_threshold = self.raw_id_threshold
         for field in meta.local_many_to_many:
-            related_objects = field.related.parent_model.objects.all()
+            related_model = getattr(field.related, 'related_model',
+                                    field.related.model)
+            related_objects = related_model.objects.all()
             if(related_objects[:raw_id_threshold].count() < raw_id_threshold):
                 yield field.name
 
@@ -174,7 +176,9 @@ def _process_foreign_key(self, field):
         raw_id_threshold = self.raw_id_threshold
         list_filter_threshold = self.list_filter_threshold
         max_count = max(list_filter_threshold, raw_id_threshold)
-        related_count = field.related.parent_model.objects.all()
+        related_model = getattr(field.related, 'related_model',
+                                field.related.model)
+        related_count = related_model.objects.all()
         related_count = related_count[:max_count].count()
 
         if related_count >= raw_id_threshold:

diff --git a/test_project/wsgi.py b/test_project/wsgi.py
@@ -10,5 +10,5 @@
 import os
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "test_project.settings")
 
-from django.core.wsgi import get_wsgi_application
+from django.core.wsgi import get_wsgi_application  # NOQA
 application = get_wsgi_application()