Ticket #5126: ticket5126_4.diff

django/newforms/models.py

@@ -13 +13 @@
-from widgets import Select, SelectMultiple, MultipleHiddenInput
-
-__all__ = (
-
-
+
+
+
-)
-
+def init_from_instance(form, instance, fields=None):
+    """
+    Populates the initial data of Form ``form`` from model instance
+    ``instance``.
+    """
+    opts = instance.__class__._meta
+    for f in opts.fields:
+        if fields and f.name not in fields:
+            continue
+        form.initial[f.name] = f.value_from_object(instance)
+
-def save_instance(form, instance, fields=None, fail_message='saved', commit=True):
-    """
-    Saves bound Form ``form``'s cleaned_data into model instance ``instance``.
@@ -54 +66 @@
-        form.save_m2m = save_m2m
-    return instance
-
+def make_model_init(form, model, fields):
+    """Returns the __init__() method for a Form."""
+    def __init__(self, data=None, files=None, auto_id='id_%s', prefix=None,
+                 initial=None):
+        from django.db import models
+        if isinstance(initial, models.Model):
+            instance, initial = initial, {}
+            for f in model._meta.fields:
+                if not f.editable:
+                    continue
+                if fields and f.name not in fields:
+                    continue
+                initial[f.name] = f.value_from_object(instance)
+        form.__init__(self, data=data, files=files, auto_id=auto_id,
+                      prefix=prefix, initial=initial)
+    return __init__
+
-def make_model_save(model, fields, fail_message):
-    "Returns the save() method for a Form."
-    def save(self, commit=True):
@@ -88 +117 @@
-            field_list.append((f.name, formfield))
-    base_fields = SortedDictFromList(field_list)
-    return type(opts.object_name + 'Form', (form,), 
-
+
+
+
-
-def form_for_instance(instance, form=BaseForm, fields=None, formfield_callback=lambda f, **kwargs: f.formfield(**kwargs)):
-    """