Commit f026a519 authored by Luke Plant's avatar Luke Plant
Browse files

Fixed #19733 - deprecated ModelForms without 'fields' or 'exclude', and added '__all__' shortcut 

This also updates all dependent functionality, including modelform_factory
 and modelformset_factory, and the generic views `ModelFormMixin`,
 `CreateView` and `UpdateView` which gain a new `fields` attribute.
parent 1e37cb37

django/contrib/admin/options.py

+13 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ from django import forms 
from django.conf import settings

from django.forms.formsets import all_valid, DELETION_FIELD_NAME

from django.forms.models import (modelform_factory, modelformset_factory,

    inlineformset_factory, BaseInlineFormSet)

    inlineformset_factory, BaseInlineFormSet, modelform_defines_fields)

from django.contrib.contenttypes.models import ContentType

from django.contrib.admin import widgets, helpers

from django.contrib.admin.util import (unquote, flatten_fieldsets, get_deleted_objects,
@@ -488,6 +488,10 @@ class ModelAdmin(BaseModelAdmin): 
            "formfield_callback": partial(self.formfield_for_dbfield, request=request),

        }

        defaults.update(kwargs)



        if defaults['fields'] is None and not modelform_defines_fields(defaults['form']):

            defaults['fields'] = forms.ALL_FIELDS



        try:

            return modelform_factory(self.model, **defaults)

        except FieldError as e:
@@ -523,6 +527,10 @@ class ModelAdmin(BaseModelAdmin): 
            "formfield_callback": partial(self.formfield_for_dbfield, request=request),

        }

        defaults.update(kwargs)

        if (defaults.get('fields') is None

            and not modelform_defines_fields(defaults.get('form'))):

            defaults['fields'] = forms.ALL_FIELDS



        return modelform_factory(self.model, **defaults)



    def get_changelist_formset(self, request, **kwargs):
@@ -1527,6 +1535,10 @@ class InlineModelAdmin(BaseModelAdmin): 
                return result



        defaults['form'] = DeleteProtectedModelForm



        if defaults['fields'] is None and not modelform_defines_fields(defaults['form']):

            defaults['fields'] = forms.ALL_FIELDS



        return inlineformset_factory(self.parent_model, self.model, **defaults)



    def get_fieldsets(self, request, obj=None):

django/contrib/auth/forms.py

+1 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ class UserChangeForm(forms.ModelForm): 


    class Meta:

        model = User

        fields = '__all__'



    def __init__(self, *args, **kwargs):

        super(UserChangeForm, self).__init__(*args, **kwargs)

django/contrib/contenttypes/generic.py

+7 −2
Original line number Diff line number Diff line
@@ -13,8 +13,9 @@ from django.db.models import signals 
from django.db.models.fields.related import ForeignObject, ForeignObjectRel

from django.db.models.related import PathInfo

from django.db.models.sql.where import Constraint

from django.forms import ModelForm

from django.forms.models import BaseModelFormSet, modelformset_factory, save_instance

from django.forms import ModelForm, ALL_FIELDS

from django.forms.models import (BaseModelFormSet, modelformset_factory, save_instance,

    modelform_defines_fields)

from django.contrib.admin.options import InlineModelAdmin, flatten_fieldsets

from django.contrib.contenttypes.models import ContentType

from django.utils import six
@@ -480,6 +481,10 @@ class GenericInlineModelAdmin(InlineModelAdmin): 
            "exclude": exclude

        }

        defaults.update(kwargs)



        if defaults['fields'] is None and not modelform_defines_fields(defaults['form']):

            defaults['fields'] = ALL_FIELDS



        return generic_inlineformset_factory(self.model, **defaults)



class GenericStackedInline(GenericInlineModelAdmin):

django/contrib/flatpages/forms.py

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ class FlatpageForm(forms.ModelForm): 


    class Meta:

        model = FlatPage

        fields = '__all__'



    def clean_url(self):

        url = self.cleaned_data['url']

django/contrib/formtools/tests/wizard/test_forms.py

+3 −1
Original line number Diff line number Diff line
@@ -60,9 +60,11 @@ class TestModel(models.Model): 
class TestModelForm(forms.ModelForm):

    class Meta:

        model = TestModel

        fields = '__all__'





TestModelFormSet = forms.models.modelformset_factory(TestModel, form=TestModelForm, extra=2)

TestModelFormSet = forms.models.modelformset_factory(TestModel, form=TestModelForm, extra=2,

                                                     fields='__all__')





class TestWizard(WizardView):