diff options
| author | Luke Plant <L.Plant.98@cantab.net> | 2008-06-24 15:41:14 +0000 |
|---|---|---|
| committer | Luke Plant <L.Plant.98@cantab.net> | 2008-06-24 15:41:14 +0000 |
| commit | 0ad37188cf999ff0db1b0b09a82eaf86e7e30c9b (patch) | |
| tree | 561fe391fab049b02f2382bf5b841dfb269a2e1f | |
| parent | 420f19aa353ee6568c93f34dfe2e6eef24bc528d (diff) | |
newforms-admin: Fixed #4046 - ForeignKey's formfield does not respect limit_choices_to. Thanks ubernostrum, programmerq
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7733 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/db/models/fields/related.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/django/db/models/fields/related.py b/django/db/models/fields/related.py index 495f9f05d6..1c0466f97f 100644 --- a/django/db/models/fields/related.py +++ b/django/db/models/fields/related.py @@ -672,7 +672,7 @@ class ForeignKey(RelatedField, Field): setattr(cls, related.get_accessor_name(), ForeignRelatedObjectsDescriptor(related)) def formfield(self, **kwargs): - defaults = {'form_class': forms.ModelChoiceField, 'queryset': self.rel.to._default_manager.all()} + defaults = {'form_class': forms.ModelChoiceField, 'queryset': self.rel.to._default_manager.complex_filter(self.rel.limit_choices_to)} defaults.update(kwargs) return super(ForeignKey, self).formfield(**defaults) @@ -810,7 +810,7 @@ class ManyToManyField(RelatedField, Field): setattr(instance, self.attname, data) def formfield(self, **kwargs): - defaults = {'form_class': forms.ModelMultipleChoiceField, 'queryset': self.rel.to._default_manager.all()} + defaults = {'form_class': forms.ModelMultipleChoiceField, 'queryset': self.rel.to._default_manager.complex_filter(self.rel.limit_choices_to)} defaults.update(kwargs) # If initial is passed in, it's a list of related objects, but the # MultipleChoiceField takes a list of IDs. |