From dbb0df2a0ec5bee80bee336fc81408efb30b7e47 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Thu, 24 Dec 2015 10:25:59 -0500 Subject: Fixed #25985 -- Updated signature of ModelAdmin.formfield_for_* to make request a positional argument. --- tests/admin_ordering/tests.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tests/admin_ordering') diff --git a/tests/admin_ordering/tests.py b/tests/admin_ordering/tests.py index e23195d8d7..6e19accc21 100644 --- a/tests/admin_ordering/tests.py +++ b/tests/admin_ordering/tests.py @@ -129,8 +129,8 @@ class TestRelatedFieldsAdminOrdering(TestCase): site.unregister(Band) def check_ordering_of_field_choices(self, correct_ordering): - fk_field = site._registry[Song].formfield_for_foreignkey(Song.band.field) - m2m_field = site._registry[Song].formfield_for_manytomany(Song.other_interpreters.field) + fk_field = site._registry[Song].formfield_for_foreignkey(Song.band.field, request=None) + m2m_field = site._registry[Song].formfield_for_manytomany(Song.other_interpreters.field, request=None) self.assertListEqual(list(fk_field.queryset), correct_ordering) self.assertListEqual(list(m2m_field.queryset), correct_ordering) @@ -159,15 +159,15 @@ class TestRelatedFieldsAdminOrdering(TestCase): """Test that custom queryset has still precedence (#21405)""" class SongAdmin(admin.ModelAdmin): # Exclude one of the two Bands from the querysets - def formfield_for_foreignkey(self, db_field, **kwargs): + def formfield_for_foreignkey(self, db_field, request, **kwargs): if db_field.name == 'band': kwargs["queryset"] = Band.objects.filter(rank__gt=2) - return super(SongAdmin, self).formfield_for_foreignkey(db_field, **kwargs) + return super(SongAdmin, self).formfield_for_foreignkey(db_field, request, **kwargs) - def formfield_for_manytomany(self, db_field, **kwargs): + def formfield_for_manytomany(self, db_field, request, **kwargs): if db_field.name == 'other_interpreters': kwargs["queryset"] = Band.objects.filter(rank__gt=2) - return super(SongAdmin, self).formfield_for_foreignkey(db_field, **kwargs) + return super(SongAdmin, self).formfield_for_foreignkey(db_field, request, **kwargs) class StaticOrderingBandAdmin(admin.ModelAdmin): ordering = ('rank',) -- cgit v1.3