Updating queryset on a ModelChoiceField, ModelMultipleChoiceField

[fero <luca.ferroni@…>]

The problem is that updating the queryset for a forms.ModelChoiceField in a form doesn't change widget choices because they are set at ModelChoiceField __init__ time.
This code works (in __init__ of my form):
MyForm.base_fields['activity'].queryset = Activity.objects.filter(user__id=2)
MyForm.base_fields['activity'].widget.choices = MyForm.base_fields['activity'].choices

So I propose the following patch in newforms/models.py
(I've never used "property" before)

class ModelChoiceField(ChoiceField):

    .....

    def _set_queryset(self, value):
        self._queryset = value
        self.widget.choices = self.choices
    def _get_queryset(self):
        return self._queryset

    queryset = property(_get_queryset, _set_queryset)

[Gary Wilson <gary.wilson@…>]

Please attach a diff. Some tests would be nice too.

[fero <luca.ferroni@…>]

Proposed patch

[fero <luca.ferroni@…>]

Attached patch file, test will be supplied asap

[peter.melvyn@…]

ModelMultipleChoiceField has the same problem

[eads]

Attached slightly improved patch. ModelChoiceField and ModelMultipleChoiceFields need tests.

[Gary Wilson]

#5830 marked as a dup.

[Brian Rosner]

Marked #5913 as a duplicate. It exposes some functionality that this patch should include.

[cohcheto@…]

Since my ticket was marked as duplicate which i don't completely agree with because my problem is with incomplete cleaning and this one is with attribute changing I'm attaching a patch consisting of eads's patch and mine

[cohcheto@…]

ead's patch and some modification in the clean() method

[Gary Wilson]

Yes, let's keep the issues separate please. I've re-opened #5913.

[Gary Wilson]

(In [6670]) Fixed #4787, #5913 -- Updating the queryset on a ModelChoiceField or ModelMultipleChoiceField now updates its widget's choices. The clean methods for ModelChoiceField and ModelMultipleChoiceField were changed to only allow choices in the specified queryset (instead of allowing all choices returned by the queryset model's default manager).