Fixed #23604 -- Allowed related m2m fields to be references in the admin.

Thanks Simon Charette for review.

1 files changed, 5 insertions, 0 deletions

diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py
index 6edae7a5c5..bf8f2717c2 100644
--- a/django/contrib/admin/options.py
+++ b/django/contrib/admin/options.py
@@ -451,6 +451,11 @@ class BaseModelAdmin(six.with_metaclass(forms.MediaDefiningClass)):
         except FieldDoesNotExist:
             return False
 
+        # Check whether this model is the origin of a M2M relationship
+        # in which case to_field has to be the pk on this model.
+        if opts.many_to_many and field.primary_key:
+            return True
+
         # Make sure at least one of the models registered for this site
         # references this field through a FK or a M2M relationship.
         registered_models = set()