newforms-admin: Fixed #5520 -- Implemented save_as functionality. This also

properly makes inlines work as well.


git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7603 bcc190cf-cafb-0310-a4f2-bffc1f526a37

2 files changed, 23 insertions, 9 deletions

diff --git a/django/newforms/formsets.py b/django/newforms/formsets.py
index b9e4a1fd02..8a76a54042 100644
--- a/django/newforms/formsets.py
+++ b/django/newforms/formsets.py
@@ -57,14 +57,18 @@ class BaseFormSet(StrAndUnicode):
             initial = {TOTAL_FORM_COUNT: self._total_form_count, INITIAL_FORM_COUNT: self._initial_form_count}
             self.management_form = ManagementForm(initial=initial, auto_id=self.auto_id, prefix=self.prefix)
 
-        # instantiate all the forms and put them in self.forms
-        self.forms = []
-        for i in range(self._total_form_count):
-            self.forms.append(self._construct_form(i))
+        # 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 = []
+        for i in xrange(self._total_form_count):
+            self.forms.append(self._construct_form(i))
+    
     def _construct_form(self, i):
         """
         Instantiates and returns the i-th form instance in a formset.
diff --git a/django/newforms/models.py b/django/newforms/models.py
index 0d946b68b0..b097cd7155 100644
--- a/django/newforms/models.py
+++ b/django/newforms/models.py
@@ -302,11 +302,13 @@ class BaseModelFormSet(BaseFormSet):
     """
     model = None
 
-    def __init__(self, data=None, files=None, auto_id='id_%s', prefix=None, queryset=None):
+    def __init__(self, data=None, files=None, auto_id='id_%s', prefix=None,
+                 queryset=None, **kwargs):
         self.queryset = queryset
-        kwargs = {'data': data, 'files': files, 'auto_id': auto_id, 'prefix': prefix}
-        kwargs['initial'] = [model_to_dict(obj) for obj in self.get_queryset()]
-        super(BaseModelFormSet, self).__init__(**kwargs)
+        defaults = {'data': data, 'files': files, 'auto_id': auto_id, 'prefix': prefix}
+        defaults['initial'] = [model_to_dict(obj) for obj in self.get_queryset()]
+        defaults.update(kwargs)
+        super(BaseModelFormSet, self).__init__(**defaults)
 
     def get_queryset(self):
         if self.queryset is not None:
@@ -386,12 +388,20 @@ def _modelformset_factory(model, form=ModelForm, formfield_callback=lambda f: f.
 
 class BaseInlineFormset(BaseModelFormSet):
     """A formset for child objects related to a parent."""
-    def __init__(self, data=None, files=None, instance=None):
+    def __init__(self, data=None, files=None, instance=None, 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):
         """