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

Merge pull request #1101 from erikr/master 

Fixed argument order for localized_fields to ensure backwards compatibility
This commit is contained in:
Florian Apolloner 2013-05-18 05:53:14 -07:00
parent cac7b44571 1c1695668f
commit e0df647143
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/forms/models.py
View File

@ -136,7 +136,7 @@ def model_to_dict(instance, fields=None, exclude=None):
data[f.name] = f.value_from_object(instance) data[f.name] = f.value_from_object(instance)
return data return data
def fields_for_model(model, fields=None, exclude=None, widgets=None, localized_fields=None, formfield_callback=None): def fields_for_model(model, fields=None, exclude=None, widgets=None, formfield_callback=None, localized_fields=None):
""" """
Returns a ``SortedDict`` containing form fields for the given model. Returns a ``SortedDict`` containing form fields for the given model.
@ -246,7 +246,7 @@ class ModelFormMetaclass(type):
opts.fields = None opts.fields = None
fields = fields_for_model(opts.model, opts.fields, opts.exclude, fields = fields_for_model(opts.model, opts.fields, opts.exclude,
opts.widgets, opts.localized_fields, formfield_callback) opts.widgets, formfield_callback, opts.localized_fields)
# make sure opts.fields doesn't specify an invalid field # make sure opts.fields doesn't specify an invalid field
none_model_fields = [k for k, v in six.iteritems(fields) if not v] none_model_fields = [k for k, v in six.iteritems(fields) if not v]
@ -413,7 +413,7 @@ class ModelForm(six.with_metaclass(ModelFormMetaclass, BaseModelForm)):
pass pass
def modelform_factory(model, form=ModelForm, fields=None, exclude=None, def modelform_factory(model, form=ModelForm, fields=None, exclude=None,
localized_fields=None, widgets=None, formfield_callback=None): formfield_callback=None, widgets=None, localized_fields=None):
""" """
Returns a ModelForm containing form fields for the given model. Returns a ModelForm containing form fields for the given model.