Ticket #6241: formset_refactor_5.diff

a/django/contrib/admin/options.py

@@ -342 +342 @@
-            fields = flatten_fieldsets(self.declared_fieldsets)
-        else:
-            fields = None
-
+model
-
-    def form_change(self, request, obj):
-        """
@@ -352 +352 @@
-            fields = flatten_fieldsets(self.declared_fieldsets)
-        else:
-            fields = None
-form_for_instance(obj
+modelform_for_model(self.model
-
-    def save_add(self, request, model, form, formsets, post_url_continue):
-        """
@@ -492 +492 @@
-            # Object list will give 'Permission Denied', so go back to admin home
-            post_url = '../../../'
-
-Model
+
-        inline_formsets = []
-        obj = self.model()
-        if request.method == 'POST':
-Model
+
-            for FormSet in self.formsets_add(request):
-obj, data=request.POST, files=
+request.POST, 
-                inline_formsets.append(inline_formset)
-            if all_valid(inline_formsets) and form.is_valid():
-                return self.save_add(request, model, form, inline_formsets, '../%s/')
-        else:
-Model
+
-            for FormSet in self.formsets_add(request):
-obj
+
-                inline_formsets.append(inline_formset)
-
-        adminForm = AdminForm(form, list(self.fieldsets_add(request)), self.prepopulated_fields)
@@ -552 +552 @@
-        if request.POST and request.POST.has_key("_saveasnew"):
-            return self.add_view(request, form_url='../../add/')
-
-Model
+
-        inline_formsets = []
-        if request.method == 'POST':
-ModelForm(request.POST, request.FILES
+Form(request.POST, request.FILES, instance=obj
-            for FormSet in self.formsets_change(request, obj):
-obj, request.POST, request.FILES
+request.POST, request.FILES, instance=obj
-                inline_formsets.append(inline_formset)
-
-            if all_valid(inline_formsets) and form.is_valid():
-                return self.save_change(request, model, form, inline_formsets)
-        else:
-ModelForm(
+Form(instance=obj, initial=request.GET
-            for FormSet in self.formsets_change(request, obj):
-
+instance=
-                inline_formsets.append(inline_formset)
-
-        ## Populate the FormWrapper.
@@ -755 +755 @@
-    def fieldsets_add(self, request):
-        if self.declared_fieldsets:
-            return self.declared_fieldsets
- = self.formset_add(request).form_class
-
+set = self.formset_add(request)
+set
-
-    def fieldsets_change(self, request, obj):
-        if self.declared_fieldsets:
-            return self.declared_fieldsets
- = self.formset_change(request, obj).form_class
-
+set = self.formset_change(request, obj)
+set
-
-class StackedInline(InlineModelAdmin):
-    template = 'admin/edit_inline/stacked.html'
@@ -778 +778 @@
-        self.opts = inline
-        self.formset = formset
-        self.fieldsets = fieldsets
+        # place orderable and deletable here since _meta is inaccesible in the
+        # templates.
+        self.orderable = formset._meta.orderable
+        self.deletable = formset._meta.deletable
-
-    def __iter__(self):
-        for form, original in zip(self.formset.change_forms, self.formset.get_queryset()):
@@ -787 +791 @@
-
-    def fields(self):
-        for field_name in flatten_fieldsets(self.fieldsets):
-form_class.
+
-
-class InlineAdminForm(AdminForm):
-    """

a/django/contrib/admin/templates/admin/edit_inline/tabular.html

@@ -11 +11 @@
-         <th {% if forloop.first %}colspan="2"{% endif %}>{{ field.label|capfirst|escape }}</th>
-        {% endif %}
-     {% endfor %}
-formset.
+
-     </tr></thead>
-   
-     {% for inline_admin_form in inline_admin_formset %}
@@ -45 +45 @@
-          {% endfor %}
-        {% endfor %}
-                
-formset.
+
-        
-        </tr>
-

a/django/newforms/formsets.py

@@ -1 @@
-
-
+
+
+
+
+
+
+
+
+
-from widgets import HiddenInput, Media
-from util import ErrorList, ValidationError
-
-
+FormSet', '
-
-# special field names
-FORM_COUNT_FIELD_NAME = 'COUNT'
@@ -20 +27 @@
-        self.base_fields[FORM_COUNT_FIELD_NAME] = IntegerField(widget=HiddenInput)
-        super(ManagementForm, self).__init__(*args, **kwargs)
-
+class BaseFormSetMetaclass(type):
+    def __new__(cls, name, bases, attrs, **options):
+        fields = [(field_name, attrs.pop(field_name)) for field_name, obj in attrs.items() if isinstance(obj, Field)]
+        fields.sort(lambda x, y: cmp(x[1].creation_counter, y[1].creation_counter))
+        
+        # If this class is subclassing another FormSet, ad that FormSet's fields.
+        # Note that we loop over the bases in *reverse*. This is necessary in
+        # order to preserve the correct order of fields.
+        for base in bases[::-1]:
+            if hasattr(base, "base_fields"):
+                fields = base.base_fields.items() + fields
+        attrs["base_fields"] = SortedDict(fields)
+        
+        opts = FormSetOptions(options and options or attrs.get("Meta", None))
+        attrs["_meta"] = opts
+        
+        return type.__new__(cls, name, bases, attrs)
+
-class BaseFormSet(object):
-    """A collection of instances of the same Form class."""
-
@@ -37 +62 @@
-            self.management_form = ManagementForm(data, files, auto_id=self.auto_id, prefix=self.prefix)
-            if self.management_form.is_valid():
-                self.total_forms = self.management_form.cleaned_data[FORM_COUNT_FIELD_NAME]
-
-
+_meta.
+_meta.
-            else:
-                # not sure that ValidationError is the best thing to raise here
-                raise ValidationError('ManagementForm data is missing or has been tampered with')
-        elif initial:
-            self.change_form_count = len(initial)
-            self.required_forms = len(initial)
-
+_meta.
-            self.management_form = ManagementForm(initial={FORM_COUNT_FIELD_NAME: self.total_forms}, auto_id=self.auto_id, prefix=self.prefix)
-        else:
-            self.change_form_count = 0
-            self.required_forms = 0
-
+_meta.
-            self.management_form = ManagementForm(initial={FORM_COUNT_FIELD_NAME: self.total_forms}, auto_id=self.auto_id, prefix=self.prefix)
-
-    def _get_add_forms(self):
-        """Return a list of all the add forms in this ``FormSet``."""
-        FormClass = self.form_class
-        if not hasattr(self, '_add_forms'):
-            add_forms = []
-            for i in range(self.change_form_count, self.total_forms):
@@ -64 +88 @@
-                    kwargs['data'] = self.data
-                if self.files:
-                    kwargs['files'] = self.files
-FormClass
+self.get_form_class(i)
-                self.add_fields(add_form, i)
-                add_forms.append(add_form)
-            self._add_forms = add_forms
@@ -73 +97 @@
-
-    def _get_change_forms(self):
-        """Return a list of all the change forms in this ``FormSet``."""
-        FormClass = self.form_class
-        if not hasattr(self, '_change_forms'):
-            change_forms = []
-            for i in range(0, self.change_form_count):
@@ -84 +107 @@
-                    kwargs['files'] = self.files
-                if self.initial:
-                    kwargs['initial'] = self.initial[i]
-FormClass
+self.get_form_class(i)
-                self.add_fields(change_form, i)
-                change_forms.append(change_form)
-
+ 
-        return self._change_forms
-    change_forms = property(_get_change_forms)
-
@@ -117 +140 @@
-        # Process change forms
-        for form in self.change_forms:
-            if form.is_valid():
-
+_meta.
-                    self.deleted_data.append(form.cleaned_data)
-                else:
-                    self.cleaned_data.append(form.cleaned_data)
@@ -144 +167 @@
-        add_errors.reverse()
-        errors.extend(add_errors)
-        # Sort cleaned_data if the formset is orderable.
-
+_meta.
-            self.cleaned_data.sort(lambda x,y: x[ORDERING_FIELD_NAME] - y[ORDERING_FIELD_NAME])
-        # Give self.clean() a chance to do validation
-        try:
@@ -167 +190 @@
-        via formset.non_form_errors()
-        """
-        return self.cleaned_data
+    
+    def get_form_class(self, index):
+        """
+        A hook to change a form class object.
+        """
+        FormClass = self._meta.form
+        FormClass.base_fields = self.base_fields
+        return FormClass
-
-    def add_fields(self, form, index):
-        """A hook for adding extra fields on to each form instance."""
-
+_meta.
-            form.fields[ORDERING_FIELD_NAME] = IntegerField(label='Order', initial=index+1)
-
+_meta.
-            form.fields[DELETION_FIELD_NAME] = BooleanField(label='Delete', required=False)
-
-    def add_prefix(self, index):
@@ -192 +223 @@
-        else:
-            return Media()
-    media = property(_get_media)
+
+class FormSet(BaseFormSet):
+    __metaclass__ = BaseFormSetMetaclass
-    
-
+
+
-    """Return a FormSet for the given form class."""
-
-
-
+
+
+
+
+
+
+
+
-def all_valid(formsets):
-    """Returns true if every formset in formsets is valid."""
-    valid = True

a/django/newforms/models.py

@@ -13 +13 @@
-from util import ValidationError, ErrorList
-from forms import BaseForm
-from fields import Field, ChoiceField, IntegerField, EMPTY_VALUES
-
+
+
-from widgets import Select, SelectMultiple, HiddenInput, MultipleHiddenInput
-
-__all__ = (
-    'ModelForm', 'BaseModelForm', 'model_to_dict', 'fields_for_model',
-    'save_instance', 'form_for_model', 'form_for_instance', 'form_for_fields',
+    'ModelFormSet', 'InlineFormset', 'modelform_for_model',
-    'formset_for_model', 'inline_formset',
-    'ModelChoiceField', 'ModelMultipleChoiceField',
-)
@@ -209 +211 @@
-            field_list.append((f.name, formfield))
-    return SortedDict(field_list)
-
-class ModelFormOptions(object):
-    def __init__(self, options=None):
-        self.model = getattr(options, 'model', None)
-        self.fields = getattr(options, 'fields', None)
-        self.exclude = getattr(options, 'exclude', None)
-
-class ModelFormMetaclass(type):
-
-
-
+
+
+
+
-        fields = [(field_name, attrs.pop(field_name)) for field_name, obj in attrs.items() if isinstance(obj, Field)]
-        fields.sort(lambda x, y: cmp(x[1].creation_counter, y[1].creation_counter))
-
@@ -230 +227 @@
-                fields = base.base_fields.items() + fields
-        declared_fields = SortedDict(fields)
-
-ModelFormOptions(
+cls.opts_class(options and options or 
-        attrs['_meta'] = opts
-
-        # Don't allow more than one Meta model defenition in bases. The fields
@@ -255 +252 @@
-                base_model = getattr(base_opts, 'model', None)
-                if base_model is not None:
-                    raise ImproperlyConfigured('%s defines more than one model.' % name)
-
+, formfield_callback
-            # fields declared in base classes override fields from the model
-            model_fields.update(declared_fields)
-            attrs['base_fields'] = model_fields
-        else:
-            attrs['base_fields'] = declared_fields
-        return type.__new__(cls, name, bases, attrs)
-
+
-class BaseModelForm(BaseForm):
-instance, 
-
+
+, instance=None
-        self.instance = instance
-        opts = self._meta
-
+
+
+
+
+
+
+
-        # if initial was provided, it should override the values from instance
-        if initial is not None:
-            object_data.update(initial)
@@ -290 +293 @@
-class ModelForm(BaseModelForm):
-    __metaclass__ = ModelFormMetaclass
-
+# this should really be named form_for_model.
+def modelform_for_model(model, form=ModelForm,
+                        formfield_callback=lambda f: f.formfield(), **options):
+    opts = model._meta
+    options.update({"model": model})
+    return ModelFormMetaclass(opts.object_name + "ModelForm", (form,),
+                              {}, formfield_callback, **options)
+
-
-# Fields #####################################################################
-
@@ -404 +415 @@
-
-# Model-FormSet integration ###################################################
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-class BaseModelFormSet(BaseFormSet):
-    """
-    A ``FormSet`` for editing a queryset and/or adding new objects to it.
-    """
-    model = None
-    queryset = None
-
-qs, 
+
-        kwargs = {'data': data, 'files': files, 'auto_id': auto_id, 'prefix': prefix}
-
-
+
+
+
+
+
+
-        super(BaseModelFormSet, self).__init__(**kwargs)
+    
+    def get_queryset(self, **kwargs):
+        """
+        Hook to returning a queryset for this model.
+        """
+        return self._meta.model._default_manager.all()
-
-    def save_new(self, form, commit=True):
-        """Saves and returns a new model instance for the given form."""
-
+_meta.
-
-    def save_instance(self, form, instance, commit=True):
-        """Saves and returns an existing model instance for the given form."""
@@ -461 +458 @@
-            return []
-        # Put the objects from self.get_queryset into a dict so they are easy to lookup by pk
-        existing_objects = {}
+        opts = self._meta
-        for obj in self.queryset:
-            existing_objects[obj.pk] = obj
-        saved_instances = []
-        for form in self.change_forms:
-self
-self
+opts
+opts
-                obj.delete()
-            else:
-                saved_instances.append(self.save_instance(form, obj, commit=commit))
@@ -474 +472 @@
-
-    def save_new_objects(self, commit=True):
-        new_objects = []
+        opts = self._meta
-        for form in self.add_forms:
-            if form.is_empty():
-                continue
-            # If someone has marked an add form for deletion, don't save the
-            # object. At some point it would be nice if we didn't display
-            # the deletion widget for add forms.
-self
+opts
-                continue
-            new_objects.append(self.save_new(form, commit=commit))
-        return new_objects
-
-    def add_fields(self, form, index):
-        """Add a hidden field for the object's primary key."""
-
+_meta.
-        form.fields[self._pk_field_name] = IntegerField(required=False, widget=HiddenInput)
-        super(BaseModelFormSet, self).add_fields(form, index)
-
-
-
+
+
+
+
+
-    """
-    Returns a FormSet class for the given Django model class. This FormSet
-    will contain change forms for every instance of the given model as well
@@ -501 +503 @@
-    This is essentially the same as ``formset_for_queryset``, but automatically
-    uses the model's default manager to determine the queryset.
-    """
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-InlineForms
+BaseInlineFormS
-    """A formset for child objects related to a parent."""
-instance, data=None, files=None
+*args, **kwargs
-        from django.db.models.fields.related import RelatedObject
-
+
+
-        # is there a better way to get the object descriptor?
-self.rel_name = RelatedObject(self.fk.rel.to, self
-qs = self.get_queryset()
-InlineFormset, self).__init__(qs, data, files, prefix=self.rel_name
+rel_name = RelatedObject(self.fk.rel.to, opts
+kwargs["prefix"] = rel_name
+BaseInlineFormSet, self).__init__(*args, **kwargs
-
-
+, **kwargs
-        """
-        Returns this FormSet's queryset, but restricted to children of 
-        self.instance
-        """
-kwargs = {self.fk.name: self.instance}
-self.model._default_manager.filter(**kwargs
+queryset = super(BaseInlineFormSet, self).get_queryset(**kwargs)
+queryset.filter(**{self.fk.name: self.instance}
-
-    def save_new(self, form, commit=True):
-        kwargs = {self.fk.get_attname(): self.instance.pk}
-
+_meta.
-        return save_instance(form, new_obj, commit=commit)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
-    """
-    Returns an ``InlineFormset`` for the given kwargs.
-
-    You must provide ``fk_name`` if ``model`` has more than one ``ForeignKey``
-    to ``parent_model``.
-    """
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+

/dev/null

@@ +1 @@
+
+from forms import BaseForm
+
+class BaseFormOptions(object):
+    """
+    The base class for all options that are associated to a form object.
+    """
+    def __init__(self, options=None):
+        self.fields = self._dynamic_attribute(options, "fields")
+        self.exclude = self._dynamic_attribute(options, "exclude")
+    
+    def _dynamic_attribute(self, obj, key, default=None):
+        try:
+            return getattr(obj, key)
+        except AttributeError:
+            try:
+                return obj[key]
+            except (TypeError, KeyError):
+                # key doesnt exist in obj or obj is None
+                return default
+
+class ModelFormOptions(BaseFormOptions):
+    """
+    Encapsulates the options on a ModelForm class.
+    """
+    def __init__(self, options=None):
+        self.model = self._dynamic_attribute(options, "model")
+        super(ModelFormOptions, self).__init__(options)
+
+class FormSetOptions(BaseFormOptions):
+    """
+    Encapsulates the options on a FormSet class.
+    """
+    def __init__(self, options=None):
+        self.form = self._dynamic_attribute(options, "form", BaseForm)
+        self.num_extra = self._dynamic_attribute(options, "num_extra", 1)
+        self.orderable = self._dynamic_attribute(options, "orderable", False)
+        self.deletable = self._dynamic_attribute(options, "deletable", False)
+        super(FormSetOptions, self).__init__(options)
+
+class ModelFormSetOptions(FormSetOptions, ModelFormOptions):
+    def __init__(self, options=None):
+        super(ModelFormSetOptions, self).__init__(options)
+        self.deletable = True
+
+class InlineFormSetOptions(ModelFormSetOptions):
+    def __init__(self, options=None):
+        super(InlineFormSetOptions, self).__init__(options)
+        self.parent_model = self._dynamic_attribute(options, "parent_model")
+        self.fk_name = self._dynamic_attribute(options, "fk_name")
+    

a/tests/modeltests/model_forms/models.py

@@ -167 +167 @@
->>> class CategoryForm(ModelForm):
-...     class Meta:
-...         model = Category
-Category()
+
->>> print f
-<tr><th><label for="id_name">Name:</label></th><td><input id="id_name" type="text" name="name" maxlength="20" /></td></tr>
-<tr><th><label for="id_slug">Slug:</label></th><td><input id="id_slug" type="text" name="slug" maxlength="20" /></td></tr>
@@ -179 +179 @@
->>> print f['name']
-<input id="id_name" type="text" name="name" maxlength="20" />
-
-Category(), 
+
->>> print f.as_ul()
-<li>Name: <input type="text" name="name" maxlength="20" /></li>
-<li>Slug: <input type="text" name="slug" maxlength="20" /></li>
-<li>The URL: <input type="text" name="url" maxlength="40" /></li>
-
-Category(), 
+
->>> f.is_valid()
-True
->>> f.cleaned_data
@@ -196 +196 @@
->>> Category.objects.all()
-[<Category: Entertainment>]
-
-Category(), 
+
->>> f.is_valid()
-True
->>> f.cleaned_data
@@ -210 +210 @@
-If you call save() with commit=False, then it will return an object that
-hasn't yet been saved to the database. In this case, it's up to you to call
-save() on the resulting model instance.
-Category(), 
+
->>> f.is_valid()
-True
->>> f.cleaned_data
@@ -225 +225 @@
-[<Category: Entertainment>, <Category: It's a test>, <Category: Third test>]
-
-If you call save() with invalid data, you'll get a ValueError.
-Category(), 
+
->>> f.errors
-{'name': [u'This field is required.'], 'slug': [u'This field is required.']}
->>> f.cleaned_data
@@ -236 +236 @@
-Traceback (most recent call last):
-...
-ValueError: The Category could not be created because the data didn't validate.
-Category(), 
+
->>> f.save()
-Traceback (most recent call last):
-...
@@ -253 +253 @@
->>> class ArticleForm(ModelForm):
-...     class Meta:
-...         model = Article
-Article(), 
+
->>> print f
-<tr><th>Headline:</th><td><input type="text" name="headline" maxlength="50" /></td></tr>
-<tr><th>Slug:</th><td><input type="text" name="slug" maxlength="50" /></td></tr>
@@ -286 +286 @@
-...     class Meta:
-...         model = Article
-...         fields = ('headline','pub_date')
-Article(), 
+
->>> print f
-<tr><th>Headline:</th><td><input type="text" name="headline" maxlength="50" /></td></tr>
-<tr><th>Pub date:</th><td><input type="text" name="pub_date" /></td></tr>
@@ -298 +298 @@
->>> class RoykoForm(ModelForm):
-...     class Meta:
-...         model = Writer
-w, auto_id=False
+auto_id=False, instance=w
->>> print f
-<tr><th>Name:</th><td><input type="text" name="name" value="Mike Royko" maxlength="50" /><br />Use both first and last names.</td></tr>
-
@@ -309 +309 @@
->>> class TestArticleForm(ModelForm):
-...     class Meta:
-...         model = Article
-rt, auto_id=False
+uto_id=False, instance=art
->>> print f.as_ul()
-<li>Headline: <input type="text" name="headline" value="Test article" maxlength="50" /></li>
-<li>Slug: <input type="text" name="slug" value="test-article" maxlength="50" /></li>
@@ -331 +331 @@
-<option value="2">It&#39;s a test</option>
-<option value="3">Third test</option>
-</select>  Hold down "Control", or "Command" on a Mac, to select more than one.</li>
-art, {'headline': u'Test headline', 'slug': 'test-headline', 'pub_date': u'1984-02-06', 'writer': u'1', 'article': 'Hello.'}
+{'headline': u'Test headline', 'slug': 'test-headline', 'pub_date': u'1984-02-06', 'writer': u'1', 'article': 'Hello.'}, instance=art
->>> f.is_valid()
-True
->>> test_art = f.save()
@@ -347 +347 @@
-...     class Meta:
-...         model = Article
-...         fields=('headline', 'slug', 'pub_date')
-art, {'headline': u'New headline', 'slug': 'new-headline', 'pub_date': u'1988-01-04'}, auto_id=False
+{'headline': u'New headline', 'slug': 'new-headline', 'pub_date': u'1988-01-04'}, auto_id=False, instance=art
->>> print f.as_ul()
-<li>Headline: <input type="text" name="headline" value="New headline" maxlength="50" /></li>
-<li>Slug: <input type="text" name="slug" value="new-headline" maxlength="50" /></li>
@@ -370 +370 @@
->>> class TestArticleForm(ModelForm):
-...     class Meta:
-...         model = Article
-new_art, auto_id=False
+auto_id=False, instance=new_art
->>> print f.as_ul()
-<li>Headline: <input type="text" name="headline" value="New headline" maxlength="50" /></li>
-<li>Slug: <input type="text" name="slug" value="new-headline" maxlength="50" /></li>
@@ -393 +393 @@
-<option value="3">Third test</option>
-</select>  Hold down "Control", or "Command" on a Mac, to select more than one.</li>
-
-new_art, 
-
+
+, instance=new_art
->>> new_art = f.save()
->>> new_art.id
-1
@@ -403 +403 @@
-[<Category: Entertainment>, <Category: It's a test>]
-
-Now, submit form data with no categories. This deletes the existing categories.
-new_art, 
-
+
+, instance=new_art
->>> new_art = f.save()
->>> new_art.id
-1
@@ -416 +416 @@
->>> class ArticleForm(ModelForm):
-...     class Meta:
-...         model = Article
-Article(), 
+
-...     'writer': u'1', 'article': u'Test.', 'categories': [u'1', u'2']})
->>> new_art = f.save()
->>