Ticket #6866: easy_validation_and_media.diff

django/contrib/admin/options.py

@@ -2 +2 @@
-from django import newforms as forms
-from django.newforms.formsets import all_valid
-from django.newforms.models import _modelform_factory, _inlineformset_factory
+# don't mess with ModelForm name defined in other places except line 217
+from django.newforms.models import ModelForm as ModelFormClass
-from django.contrib.contenttypes.models import ContentType
-from django.contrib.admin import widgets
-from django.contrib.admin.util import get_deleted_objects
@@ -212 +214 @@
-    save_on_top = False
-    ordering = None
-    inlines = []
+    admin_form = ModelFormClass
-
-    def __init__(self, model, admin_site):
-        self.model = model
@@ -308 +311 @@
-        """
-        Returns a Form class for use in the admin add view. This is used by
-        add_view and change_view.
-        
-        Note that if you override this method, your form will *not*
-        automatically get the custom admin widgets. raw_id_fields, fields,
-        fieldsets, filter_vertical, and filter_horizonal will not apply to
-        your form. You will have manually specify those widgets.
-        """
-        if self.declared_fieldsets:
-            fields = flatten_fieldsets(self.declared_fieldsets)
-        else:
-            fields = None
-
+orm=self.admin_form, f
-
-    def get_formsets(self, request, obj=None):
-        for inline in self.inline_instances:

django/newforms/models.py

@@ -277 +277 @@
-    __metaclass__ = ModelFormMetaclass
-
-# XXX: This API *will* change. Use at your own risk.
-
+
+
-                       formfield_callback=lambda f: f.formfield()):
-    # HACK: we should be able to construct a ModelForm without creating
-    # and passing in a temporary inner class
@@ -287 +288 @@
-    setattr(Meta, 'fields', fields)
-    setattr(Meta, 'exclude', exclude)
-    class_name = model.__name__ + 'Form'
-ModelF
+f
-                              formfield_callback=formfield_callback)
-
-