Fix Django2.0 admin interface bug, bump version to 1.1.8

FundersClub · Apr 18, 2018 · d466128 · d466128
1 parent e11c4bb
commit d466128
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+Version 1.1.8
+------------------------
+*   Fix Django2.0 admin interface bug
+
+
 Version 1.1.7
 ------------------------
 *   Experimental Django2.0 support

diff --git a/papertrail/__init__.py b/papertrail/__init__.py
@@ -1,2 +1,2 @@
-__version__ = '1.1.7'
+__version__ = '1.1.8'
 default_app_config = 'papertrail.apps.PapertrailConfig'
diff --git a/papertrail/admin.py b/papertrail/admin.py
@@ -217,7 +217,10 @@ def _map_to_related_queryset(self, queryset, field):
             try:
                 model = field.related.parent_model
             except AttributeError:
-                model = field.rel.model
+                try:
+                    model = field.rel.model
+                except AttributeError:
+                    model = field.related_model
 
         # Once we have both pieces, we can just query the model for the ids
         return model.objects.filter(pk__in=pks)

diff --git a/setup.py b/setup.py
@@ -9,7 +9,7 @@
 
 setup(
     name='django-papertrail',
-    version='1.1.7',
+    version='1.1.8',
     packages=['papertrail'],
     install_requires=[
         'Django>=1.10,<2.0;python_version<"3.0"',