mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #21405 -- Prevented queryset overwrite in BaseModelAdmin

Browse Source 
Thanks guido@20tab.com for the report and Tim Graham for the
analyze.
This commit is contained in:
Claude Paroz
2013-11-21 22:18:52 +01:00
parent e6d5f7ae49
commit 1718b5256c
3 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
django/contrib/admin/options.py
View File

@@ -215,9 +215,10 @@ class BaseModelAdmin(six.with_metaclass(RenameBaseModelAdminMethods)):
}) })
kwargs['empty_label'] = _('None') if db_field.blank else None kwargs['empty_label'] = _('None') if db_field.blank else None
queryset = self.get_field_queryset(db, db_field, request) if not 'queryset' in kwargs:
if queryset is not None: queryset = self.get_field_queryset(db, db_field, request)
kwargs['queryset'] = queryset if queryset is not None:
kwargs['queryset'] = queryset
return db_field.formfield(**kwargs) return db_field.formfield(**kwargs)
@@ -238,9 +239,10 @@ class BaseModelAdmin(six.with_metaclass(RenameBaseModelAdminMethods)):
elif db_field.name in (list(self.filter_vertical) + list(self.filter_horizontal)): elif db_field.name in (list(self.filter_vertical) + list(self.filter_horizontal)):
kwargs['widget'] = widgets.FilteredSelectMultiple(db_field.verbose_name, (db_field.name in self.filter_vertical)) kwargs['widget'] = widgets.FilteredSelectMultiple(db_field.verbose_name, (db_field.name in self.filter_vertical))
queryset = self.get_field_queryset(db, db_field, request) if not 'queryset' in kwargs:
if queryset is not None: queryset = self.get_field_queryset(db, db_field, request)
kwargs['queryset'] = queryset if queryset is not None:
kwargs['queryset'] = queryset
return db_field.formfield(**kwargs) return db_field.formfield(**kwargs)

2
docs/releases/1.6.1.txt
View File

@@ -28,3 +28,5 @@ Bug fixes
non related to file extensions (#21457). non related to file extensions (#21457).
* Fixed display of inline instances in formsets when parent has 0 for primary * Fixed display of inline instances in formsets when parent has 0 for primary
key (#21472). key (#21472).
* Fixed a regression where custom querysets for foreign keys were overwritten
if ``ModelAdmin`` had ordering set (#21405).

22
tests/admin_ordering/tests.py
View File

@@ -147,3 +147,25 @@ class TestRelatedFieldsAdminOrdering(TestCase):
# should be ordered by rank (defined by the ModelAdmin) # should be ordered by rank (defined by the ModelAdmin)
self.check_ordering_of_field_choices([self.b1, self.b2]) self.check_ordering_of_field_choices([self.b1, self.b2])
def test_custom_queryset_still_wins(self):
"""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):
if db_field.name == 'band':
kwargs["queryset"] = Band.objects.filter(rank__gt=2)
return super(SongAdmin, self).formfield_for_foreignkey(db_field, **kwargs)
def formfield_for_manytomany(self, db_field, **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)
class StaticOrderingBandAdmin(admin.ModelAdmin):
ordering = ('rank',)
admin.site.unregister(Song)
admin.site.register(Song, SongAdmin)
admin.site.register(Band, StaticOrderingBandAdmin)
self.check_ordering_of_field_choices([self.b2])