mirrors
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues 24 Releases Wiki Activity

Fixed #17683 -- Make sure `BaseModelFormSet` respects defined widgets.

This commit is contained in:
Simon Charette 2013-02-05 05:39:35 -05:00
parent ec469ade2b
commit a097ee32d8
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/forms/models.py
View File

@ -678,7 +678,11 @@ class BaseModelFormSet(BaseFormSet):
else: else:
qs = self.model._default_manager.get_query_set() qs = self.model._default_manager.get_query_set()
qs = qs.using(form.instance._state.db) qs = qs.using(form.instance._state.db)
form.fields[self._pk_field.name] = ModelChoiceField(qs, initial=pk_value, required=False, widget=HiddenInput) if form._meta.widgets:
widget = form._meta.widgets.get(self._pk_field.name, HiddenInput)
else:
widget = HiddenInput
form.fields[self._pk_field.name] = ModelChoiceField(qs, initial=pk_value, required=False, widget=widget)
super(BaseModelFormSet, self).add_fields(form, index) super(BaseModelFormSet, self).add_fields(form, index)
def modelformset_factory(model, form=ModelForm, formfield_callback=None, def modelformset_factory(model, form=ModelForm, formfield_callback=None,

17
tests/regressiontests/model_formsets_regress/tests.py
View File

@ -261,14 +261,17 @@ class FormsetTests(TestCase):
formset.save() formset.save()
class CustomWidget(forms.CharField): class CustomWidget(forms.widgets.TextInput):
pass pass
class UserSiteForm(forms.ModelForm): class UserSiteForm(forms.ModelForm):
class Meta: class Meta:
model = UserSite model = UserSite
widgets = {'data': CustomWidget} widgets = {
'id': CustomWidget,
'data': CustomWidget,
}
class Callback(object): class Callback(object):
@ -283,24 +286,27 @@ class Callback(object):
class FormfieldCallbackTests(TestCase): class FormfieldCallbackTests(TestCase):
""" """
Regression for #13095: Using base forms with widgets Regression for #13095 and #17683: Using base forms with widgets
defined in Meta should not raise errors. defined in Meta should not raise errors and BaseModelForm should respect
the specified pk widget.
""" """
def test_inlineformset_factory_default(self): def test_inlineformset_factory_default(self):
Formset = inlineformset_factory(User, UserSite, form=UserSiteForm) Formset = inlineformset_factory(User, UserSite, form=UserSiteForm)
form = Formset().forms[0] form = Formset().forms[0]
self.assertTrue(isinstance(form['id'].field.widget, CustomWidget))
self.assertTrue(isinstance(form['data'].field.widget, CustomWidget)) self.assertTrue(isinstance(form['data'].field.widget, CustomWidget))
def test_modelformset_factory_default(self): def test_modelformset_factory_default(self):
Formset = modelformset_factory(UserSite, form=UserSiteForm) Formset = modelformset_factory(UserSite, form=UserSiteForm)
form = Formset().forms[0] form = Formset().forms[0]
self.assertTrue(isinstance(form['id'].field.widget, CustomWidget))
self.assertTrue(isinstance(form['data'].field.widget, CustomWidget)) self.assertTrue(isinstance(form['data'].field.widget, CustomWidget))
def assertCallbackCalled(self, callback): def assertCallbackCalled(self, callback):
id_field, user_field, data_field = UserSite._meta.fields id_field, user_field, data_field = UserSite._meta.fields
expected_log = [ expected_log = [
(id_field, {}), (id_field, {'widget': CustomWidget}),
(user_field, {}), (user_field, {}),
(data_field, {'widget': CustomWidget}), (data_field, {'widget': CustomWidget}),
] ]
@ -318,7 +324,6 @@ class FormfieldCallbackTests(TestCase):
formfield_callback=callback) formfield_callback=callback)
self.assertCallbackCalled(callback) self.assertCallbackCalled(callback)
class BaseCustomDeleteFormSet(BaseFormSet): class BaseCustomDeleteFormSet(BaseFormSet):
""" """
A formset mix-in that lets a form decide if it's to be deleted. A formset mix-in that lets a form decide if it's to be deleted.