Ticket #14880: ticket_14880_tests_trunk.diff

tests/regressiontests/admin_views/models.py

@@ -626 +626 @@
     list_display = ('datum', 'employee')
     list_filter = ('employee',)
 
+class Publisher(models.Model):
+    name        = models.CharField(max_length=20)
+    overseas    = models.BooleanField()
+
+class PublishedBook(models.Model):
+    title           = models.CharField(max_length=20)
+    local_publisher = models.ForeignKey(Publisher, limit_choices_to={'overseas': False})
+
+class PublishedBookAdmin(admin.ModelAdmin):
+    raw_id_fields = ['local_publisher',]
+
+class PublisherAdmin(admin.ModelAdmin):
+    list_display = ['name', 'overseas']
+
 admin.site.register(Article, ArticleAdmin)
 admin.site.register(CustomArticle, CustomArticleAdmin)
 admin.site.register(Section, save_as=True, inlines=[ArticleInline])
@@ -674 +688 @@
 admin.site.register(Pizza, PizzaAdmin)
 admin.site.register(Topping)
 admin.site.register(Album, AlbumAdmin)
+admin.site.register(PublishedBook, PublishedBookAdmin)
+admin.site.register(Publisher, PublisherAdmin)

tests/regressiontests/admin_views/tests.py

@@ -2 +2 @@
 
 import re
 import datetime
+import urlparse
 
 from django.conf import settings
 from django.core import mail
@@ -33 +34 @@
     FooAccount, Gallery, ModelWithStringPrimaryKey, \
     Person, Persona, Picture, Podcast, Section, Subscriber, Vodcast, \
     Language, Collector, Widget, Grommet, DooHickey, FancyDoodad, Whatsit, \
-    Category, Post, Plot, FunkyTag, Chapter, Book, Promo, WorkHour, Employee
+    Category, Post, Plot, FunkyTag, Chapter, Book, Promo, WorkHour, Employee, \
+    Publisher
 
 
 class AdminViewBasicTest(TestCase):
@@ -2307 +2309 @@
         response = self.client.get('/test_admin/admin/admin_views/pizza/add/')
         self.assertEqual(response.status_code, 200)
 
+class RawIdFieldsTest(TestCase):
+    fixtures = ['admin-views-users.xml']
+
+    def setUp(self):
+        self.client.login(username='super', password='secret')
+
+    def tearDown(self):
+        self.client.logout()
+
+    def test_limit_choices_to(self):
+        """Regression test for 14880"""
+        Publisher(name='local-guy', overseas=False).save()
+        Publisher(name='overseas-guy', overseas=True).save()
+        response = self.client.get('/test_admin/admin/admin_views/publishedbook/add/')
+        # Find the link
+        m = re.search(r'<a href="([^"]*)"[^>]* id="lookup_id_local_publisher"', response.content)
+        self.assertTrue(m) # Got a match
+        popup_url = m.groups()[0].replace("&amp;", "&")
+
+        # Handle relative links
+        popup_url = urlparse.urljoin(response.request['PATH_INFO'], popup_url)
+        # Get the popup
+        response2 = self.client.get(popup_url)
+        self.assertContains(response2, "local-guy")
+        self.assertNotContains(response2, "overseas-guy")
+
 class UserAdminTest(TestCase):
     """
     Tests user CRUD functionality.