Ticket #2360: create_update.diff

django/views/generic/create_update.py

@@ -10 +10 @@
 
 def create_object(request, model, template_name=None,
         template_loader=loader, extra_context=None, post_save_redirect=None,
-        login_required=False, follow=None, context_processors=None):
+        login_required=False, follow=None, context_processors=None,
+        extra_content={}, new_manipulator=None, pre_populate=False):
     """
     Generic object-creation function.
 
@@ -23 +24 @@
     if login_required and not request.user.is_authenticated():
         return redirect_to_login(request.path)
 
-    manipulator = model.AddManipulator(follow=follow)
+    if new_manipulator:
+        manipulator = new_manipulator()
+    else:
+        manipulator = model.AddManipulator(follow=follow)
+
     if request.POST:
         # If data was POSTed, we're trying to create a new object
         new_data = request.POST.copy()
@@ -33 +38 @@
 
         # Check for errors
         errors = manipulator.get_validation_errors(new_data)
+        new_data.update(extra_content)
         manipulator.do_html2python(new_data)
 
         if not errors:
@@ -53 +59 @@
     else:
         # No POST, so we want a brand new form without any data or errors
         errors = {}
-        new_data = manipulator.flatten_data()
+        if new_manipulator():
+            new_data = {}
+#           for field in manipulator.fields:
+#               new_data[field] = ''
+        else:
+            new_data = manipulator.flatten_data()
 
+        if pre_populate:
+            new_data.update(extra_content)
+
     # Create the FormWrapper, template, context, response
     form = forms.FormWrapper(manipulator, new_data, errors)
     if not template_name:
@@ -74 +88 @@
         slug_field=None, template_name=None, template_loader=loader,
         extra_context=None, post_save_redirect=None,
         login_required=False, follow=None, context_processors=None,
-        template_object_name='object'):
+        template_object_name='object', explicit_manipulator=None):
     """
     Generic object-update function.