Changeset 6655

Timestamp:

11/06/07 15:53:15 (1 year ago)

Author:

jkocherhans

Message:

newforms-admin: Fixed #5733. Added formset_for_queryset. This is backwards incompatble for anyone using formset_for_model or BaseModelFormSet?.

Files:

• django/branches/newforms-admin/django/newforms/models.py (modified) (4 diffs)
• django/branches/newforms-admin/tests/modeltests/model_formsets (added)
• django/branches/newforms-admin/tests/modeltests/model_formsets/__init__.py (added)
• django/branches/newforms-admin/tests/modeltests/model_formsets/models.py (added)

django/branches/newforms-admin/django/newforms/models.py

@@ -16 +16 @@
-__all__ = (
-    'save_instance', 'form_for_model', 'form_for_instance', 'form_for_fields',
-ModelChoiceField', 'ModelMultipleChoiceField', 'formset_for_model
-inline_formset'
+formset_for_model', 'formset_for_queryset', 'inline_formset
+ModelChoiceField', 'ModelMultipleChoiceField',
-)
-
@@ -238 +238 @@
-class BaseModelFormSet(BaseFormSet):
-    """
-attatched to a particular model or sequence of model instances
+for editing a queryset and/or adding new objects to it
-    """
-    model = None
-
-
-    self.instances = instances
+
+
+def __init__(self, data=None, files=None, auto_id='id_%s', prefix=None):
-        kwargs = {'data': data, 'files': files, 'auto_id': auto_id, 'prefix': prefix}
-instances
-instance) for instance in instances
+self.queryset
+obj) for obj in self.get_queryset()
-        super(BaseModelFormSet, self).__init__(**kwargs)
+
+    def get_queryset(self):
+        return self.queryset._clone()
-
-    def save_new(self, form, commit=True):
@@ -261 +264 @@
-        as necessary, and returns the list of instances.
-        """
+        return self.save_existing_objects(commit) + self.save_new_objects(commit)
+
+    def save_existing_objects(self, commit=True):
+        if not self.queryset:
+            return []
+        # Put the objects from self.get_queryset into a dict so they are easy to lookup by pk
+        existing_objects = {}
+        for obj in self.get_queryset():
+            existing_objects[obj._get_pk_val()] = obj
-        saved_instances = []
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        for form in self.add_forms:
-            if form.is_empty():
-                continue
-
-
+
+
+
+
+
+
+
-
-    def add_fields(self, form, index):
@@ -287 +301 @@
-        super(BaseModelFormSet, self).add_fields(form, index)
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    FormSet = formset_for_form(form, formset, extra, orderable, deletable)
-
+
+
-    return FormSet
+
+def formset_for_model(model, form=BaseForm, formfield_callback=lambda f: f.formfield(),
+                      formset=BaseModelFormSet, extra=1, orderable=False, deletable=False, fields=None):
+    """
+    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
+    as the number of add forms specified by ``extra``.
+    
+    This is essentially the same as ``formset_for_queryset``, but automatically
+    uses the model's default manager to determine the queryset.
+    """
+    qs = model._default_manager.all()
+    return formset_for_queryset(qs, form, formfield_callback, formset, extra, orderable, deletable, fields)
-
-class InlineFormset(BaseModelFormSet):
-    """A formset for child objects related to a parent."""
-=None
+
-        from django.db.models.fields.related import RelatedObject
-        self.instance = instance
-        # is there a better way to get the object descriptor?
-        self.rel_name = RelatedObject(self.fk.rel.to, self.model, self.fk).get_accessor_name()
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-    def save_new(self, form, commit=True):