Changeset 7603

Timestamp:

06/09/08 22:54:05 (6 months ago)

Author:

brosner

Message:

newforms-admin: Fixed #5520 -- Implemented save_as functionality. This also
properly makes inlines work as well.

Files:

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

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

@@ -448 +448 @@
-            'opts': opts,
-            'content_type_id': ContentType.objects.get_for_model(model).id,
+            'save_as': self.save_as,
-            'save_on_top': self.save_on_top,
-        }
@@ -478 +479 @@
-            form = ModelForm(request.POST, request.FILES)
-            for FormSet in self.get_formsets(request):
-
+
+
-                inline_formsets.append(inline_formset)
-            if all_valid(inline_formsets) and form.is_valid():

django/branches/newforms-admin/django/contrib/admin/templatetags/admin_modify.py

@@ -21 +21 @@
-    change = context['change']
-    is_popup = context['is_popup']
-
-
-
+
-    return {
-        'onclick_attrib': (opts.get_ordered_objects() and change

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

@@ -58 +58 @@
-            self.management_form = ManagementForm(initial=initial, auto_id=self.auto_id, prefix=self.prefix)
-
+        # construct the forms in the formset
+        self._construct_forms()
+
+    def __unicode__(self):
+        return self.as_table()
+
+    def _construct_forms(self):
-        # instantiate all the forms and put them in self.forms
-        self.forms = []
-
+x
-            self.forms.append(self._construct_form(i))
-
-
-
-
+
-    def _construct_form(self, i):
-        """

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

@@ -303 +303 @@
-    model = None
-
-
+
+
-        self.queryset = queryset
-
-
-
+
+
+
+
-
-    def get_queryset(self):
@@ -387 +389 @@
-class BaseInlineFormset(BaseModelFormSet):
-    """A formset for child objects related to a parent."""
-
+, save_as_new=False
-        from django.db.models.fields.related import RelatedObject
-        self.instance = instance
+        self.save_as_new = save_as_new
-        # 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()
-        super(BaseInlineFormset, self).__init__(data, files, prefix=self.rel_name)
+    
+    def _construct_forms(self):
+        from django.newforms.formsets import INITIAL_FORM_COUNT
+        if self.save_as_new:
+            self._total_form_count = self.management_form.cleaned_data[INITIAL_FORM_COUNT]
+            self._initial_form_count = 0
+        super(BaseInlineFormset, self)._construct_forms()
-
-    def get_queryset(self):

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

@@ -233 +233 @@
-Les Fleurs du Mal
-
+The save_as_new parameter lets you re-associate the data to a new instance.
+This is used in the admin for save_as functionality.
+
+>>> data = {
+...     'book_set-TOTAL_FORMS': '3', # the number of forms rendered
+...     'book_set-INITIAL_FORMS': '2', # the number of forms with initial data
+...     'book_set-0-id': '1',
+...     'book_set-0-title': 'Les Fleurs du Mal',
+...     'book_set-1-id': '2',
+...     'book_set-1-title': 'Le Spleen de Paris',
+...     'book_set-2-title': '',
+... }
+
+>>> formset = AuthorBooksFormSet(data, instance=Author(), save_as_new=True)
+>>> formset.is_valid()
+True
+
+>>> new_author = Author.objects.create(name='Charles Baudelaire')
+>>> formset.instance = new_author
+>>> [book for book in formset.save() if book.author.pk == new_author.pk]
+[<Book: Les Fleurs du Mal>, <Book: Le Spleen de Paris>]
+
-"""}