Changeset 7930

Timestamp:

07/15/08 17:41:17 (4 months ago)

Author:

brosner

Message:

newforms-admin: Fixed #7230 -- Added a save_m2m method to BaseModelFormSet? when commit=False is passed to save. Thanks Books Travis for the original report.

Files:

• django/branches/newforms-admin/django/newforms/models.py (modified) (3 diffs)
• django/branches/newforms-admin/docs/modelforms.txt (modified) (1 diff)
• django/branches/newforms-admin/tests/modeltests/model_formsets/models.py (modified) (2 diffs)

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

@@ -332 +332 @@
-        as necessary, and returns the list of instances.
-        """
+        if not commit:
+            self.saved_forms = []
+            def save_m2m():
+                for form in self.saved_forms:
+                    form.save_m2m()
+            self.save_m2m = save_m2m
-        return self.save_existing_objects(commit) + self.save_new_objects(commit)
-
@@ -354 +360 @@
-                    self.changed_objects.append((obj, form.changed_data))
-                    saved_instances.append(self.save_existing(form, obj, commit=commit))
+                    if not commit:
+                        self.saved_forms.append(form)
-        return saved_instances
-
@@ -366 +374 @@
-                continue
-            self.new_objects.append(self.save_new(form, commit=commit))
+            if not commit:
+                self.saved_forms.append(form)
-        return self.new_objects
-

django/branches/newforms-admin/docs/modelforms.txt

@@ -455 +455 @@
-
-This gives you the ability to attach data to the instances before saving them
-
+
+
+
-
-Limiting the number of objects editable

django/branches/newforms-admin/tests/modeltests/model_formsets/models.py

@@ -14 +14 @@
-        return self.title
-
+class AuthorMeeting(models.Model):
+    name = models.CharField(max_length=100)
+    authors = models.ManyToManyField(Author)
+    created = models.DateField(editable=False)
+    
+    def __unicode__(self):
+        return self.name
+
-
-__test__ = {'API_TESTS': """
+
+>>> from datetime import date
-
->>> from django.newforms.models import modelformset_factory
@@ -163 +173 @@
-[<Author: Walt Whitman>]
-
+Test the behavior of commit=False and save_m2m
+
+>>> meeting = AuthorMeeting.objects.create(created=date.today())
+>>> meeting.authors = Author.objects.all()
+
+# create an Author instance to add to the meeting.
+>>> new_author = Author.objects.create(name=u'John Steinbeck')
+
+>>> AuthorMeetingFormSet = modelformset_factory(AuthorMeeting, extra=1, can_delete=True)
+>>> data = {
+...     'form-TOTAL_FORMS': '2', # the number of forms rendered
+...     'form-INITIAL_FORMS': '1', # the number of forms with initial data
+...     'form-MAX_FORMS': '0', # the max number of forms
+...     'form-0-id': '1',
+...     'form-0-name': '2nd Tuesday of the Week Meeting',
+...     'form-0-authors': [2, 1, 3, 4],
+...     'form-1-name': '',
+...     'form-1-authors': '',
+...     'form-1-DELETE': '',
+... }
+>>> formset = AuthorMeetingFormSet(data=data, queryset=AuthorMeeting.objects.all())
+>>> formset.is_valid()
+True
+>>> instances = formset.save(commit=False)
+>>> for instance in instances:
+...     instance.created = date.today()
+...     instance.save()
+>>> formset.save_m2m()
+>>> instances[0].authors.all()
+[<Author: Charles Baudelaire>, <Author: Walt Whitman>, <Author: Paul Verlaine>, <Author: John Steinbeck>]
+
+# delete the author we created to allow later tests to continue working.
+>>> new_author.delete()
+
-Test the behavior of max_num with model formsets. It should properly limit
-the queryset to reduce the amount of objects being pulled in when not being