Django

Code

Changeset 7733

Show
Ignore:
Timestamp:
06/24/08 10:41:14 (5 months ago)
Author:
lukeplant
Message:

newforms-admin: Fixed #4046 - ForeignKey?'s formfield does not respect limit_choices_to. Thanks ubernostrum, programmerq

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/newforms-admin/django/db/models/fields/related.py

    r7669 r7733  
    673673 
    674674    def formfield(self, **kwargs): 
    675         defaults = {'form_class': forms.ModelChoiceField, 'queryset': self.rel.to._default_manager.all()} 
     675        defaults = {'form_class': forms.ModelChoiceField, 'queryset': self.rel.to._default_manager.complex_filter(self.rel.limit_choices_to)} 
    676676        defaults.update(kwargs) 
    677677        return super(ForeignKey, self).formfield(**defaults) 
    …… 
    811811 
    812812    def formfield(self, **kwargs): 
    813         defaults = {'form_class': forms.ModelMultipleChoiceField, 'queryset': self.rel.to._default_manager.all()} 
     813        defaults = {'form_class': forms.ModelMultipleChoiceField, 'queryset': self.rel.to._default_manager.complex_filter(self.rel.limit_choices_to)} 
    814814        defaults.update(kwargs) 
    815815        # If initial is passed in, it's a list of related objects, but the