Changeset 7507

Timestamp:

04/29/08 00:45:46 (1 year ago)

Author:

brosner

Message:

newforms-admin: Fixed #6117 -- Implemented change history for the admin. This includes the ability to track changes on a newform. Model formsets now only return the changed/new objects saved. A big thanks to Karen Tracey and Alex Gaynor.

Files:

• django/branches/newforms-admin/django/contrib/admin/options.py (modified) (1 diff)
• django/branches/newforms-admin/django/newforms/forms.py (modified) (2 diffs)
• django/branches/newforms-admin/django/newforms/models.py (modified) (2 diffs)
• django/branches/newforms-admin/tests/modeltests/model_formsets/models.py (modified) (5 diffs)

django/branches/newforms-admin/django/contrib/admin/options.py

@@ -390 +390 @@
-                formset.save()
-
-
-
-
+
-        change_message = []
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if not change_message:
-            change_message = _('No fields changed.')

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

@@ -82 +82 @@
-        self.empty_permitted = empty_permitted
-        self._errors = None # Stores the errors after clean() has been called.
+        self._changed_data = None
-
-        # The base_fields class attribute is the *class-wide* definition of
@@ -244 +245 @@
-        Returns True if data differs from initial.
-        """
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    def _get_media(self):

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

@@ -329 +329 @@
-
-    def save_existing_objects(self, commit=True):
+        self.changed_objects = []
+        self.deleted_objects = []
-        if not self.get_queryset():
-            return []
+
-        # Put the objects from self.get_queryset into a dict so they are easy to lookup by pk
-        existing_objects = {}
@@ -339 +342 @@
-            obj = existing_objects[form.cleaned_data[self.model._meta.pk.attname]]
-            if self.can_delete and form.cleaned_data[DELETION_FIELD_NAME]:
+                self.deleted_objects.append(obj)
-                obj.delete()
-            else:
-
+
+
+
-        return saved_instances
-
-    def save_new_objects(self, commit=True):
-
+self.
-        for form in self.extra_forms:
-            if not form.has_changed():
-                continue
-            # If someone has marked an add form for deletion, don't save the
-
-
+
-            if self.can_delete and form.cleaned_data[DELETION_FIELD_NAME]:
-                continue
-
-
+self.
+self.
-
-    def add_fields(self, form, index):

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

@@ -51 +51 @@
-
-Gah! We forgot Paul Verlaine. Let's create a formset to edit the existing
-This time we'll use formset_for_queryset.
-
-but in that case we'll use it to display 
+We *could* pass in a queryset to
+
+
-
->>> qs = Author.objects.order_by('name')
@@ -80 +80 @@
-True
-
-
-
+
+
+
-
->>> for author in Author.objects.order_by('name'):
@@ -125 +126 @@
-True
-
-
-
+
+
+
-
->>> for author in Author.objects.order_by('name'):
@@ -134 +136 @@
-Paul Verlaine
-
+Let's edit a record to ensure save only returns that one record.
+
+>>> data = {
+...     'form-TOTAL_FORMS': '4', # the number of forms rendered
+...     'form-INITIAL_FORMS': '3', # the number of forms with initial data
+...     'form-0-id': '2',
+...     'form-0-name': 'Walt Whitman',
+...     'form-1-id': '1',
+...     'form-1-name': 'Charles Baudelaire',
+...     'form-2-id': '3',
+...     'form-2-name': 'Paul Verlaine',
+...     'form-3-name': '',
+...     'form-3-DELETE': '',
+... }
+
+>>> formset = AuthorFormSet(data=data, queryset=qs)
+>>> formset.is_valid()
+True
+
+# One record has changed.
+>>> formset.save()
+[<Author: Walt Whitman>]
-
-# Inline Formsets ############################################################
@@ -200 +224 @@
-
->>> formset.save()
-s Fleurs du Mal>, <Book: Le
+
-
-As you can see, 'Le Spleen de Paris' is now a book belonging to Charles Baudelaire.