From a24cf217220dca44b7bd5b36ad9c14a96bca486e Mon Sep 17 00:00:00 2001
From: Emmanuelle Delescolle <emma@lasolution.be>
Date: Sun, 5 Oct 2014 20:06:51 +0200
Subject: Fixed #23604 -- Allowed related m2m fields to be references in the
 admin.

Thanks Simon Charette for review.
---
 tests/admin_views/admin.py  |  3 ++-
 tests/admin_views/models.py | 10 ++++++++++
 tests/admin_views/tests.py  |  4 ++++
 3 files changed, 16 insertions(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/admin_views/admin.py b/tests/admin_views/admin.py
index 7caca29c7b..4dcf40b610 100644
--- a/tests/admin_views/admin.py
+++ b/tests/admin_views/admin.py
@@ -37,7 +37,7 @@ from .models import (Article, Chapter, Child, Parent, Picture, Widget,
     State, City, Restaurant, Worker, ParentWithDependentChildren,
     DependentChild, StumpJoke, FieldOverridePost, FunkyTag,
     ReferencedByParent, ChildOfReferer, M2MReference, ReferencedByInline,
-    InlineReference, InlineReferer)
+    InlineReference, InlineReferer, Ingredient)
 
 
 def callable_year(dt_value):
@@ -940,6 +940,7 @@ site.register(EmptyModelHidden, EmptyModelHiddenAdmin)
 site.register(EmptyModelVisible, EmptyModelVisibleAdmin)
 site.register(EmptyModelMixin, EmptyModelMixinAdmin)
 site.register(StumpJoke)
+site.register(Ingredient)
 
 # Register core models we need in our tests
 from django.contrib.auth.models import User, Group
diff --git a/tests/admin_views/models.py b/tests/admin_views/models.py
index fd37e8b79e..0d61ba3fbb 100644
--- a/tests/admin_views/models.py
+++ b/tests/admin_views/models.py
@@ -852,3 +852,13 @@ class InlineReference(models.Model):
 
 class InlineReferer(models.Model):
     refs = models.ManyToManyField(InlineReference)
+
+
+# Models for #23604
+class Recipe(models.Model):
+    name = models.CharField(max_length=20)
+
+
+class Ingredient(models.Model):
+    name = models.CharField(max_length=20)
+    recipes = models.ManyToManyField('Recipe', related_name='ingredients')
diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py
index 518e8fd7ba..abd590ed40 100644
--- a/tests/admin_views/tests.py
+++ b/tests/admin_views/tests.py
@@ -620,6 +620,10 @@ class AdminViewBasicTest(AdminViewBasicTestCase):
         response = self.client.get("/test_admin/admin/admin_views/m2mreference/", {TO_FIELD_VAR: 'id'})
         self.assertEqual(response.status_code, 200)
 
+        # #23604 - Specifying the pk of this model should be allowed when this model defines a m2m relationship
+        response = self.client.get("/test_admin/admin/admin_views/ingredient/", {TO_FIELD_VAR: 'id'})
+        self.assertEqual(response.status_code, 200)
+
         # #23329 - Specifying a field that is not refered by any other model directly registered
         # to this admin site but registered through inheritance should be allowed.
         response = self.client.get("/test_admin/admin/admin_views/referencedbyparent/", {TO_FIELD_VAR: 'id'})
-- 
cgit v1.3