Ticket #9025: django_nested_inlines.diff

django/contrib/admin/options.py

@@ -279 +279 @@
-    def get_formsets(self, request, obj=None):
-        for inline in self.inline_instances:
-            yield inline.get_formset(request, obj)
-
+
+
+
+
+
-    def log_addition(self, request, object):
-        """
-        Log that an object has been successfully added. 
@@ -603 +607 @@
-        adminForm = helpers.AdminForm(form, self.get_fieldsets(request, obj), self.prepopulated_fields)
-        media = self.media + adminForm.media
-
+        nested_inlines = []
+        subnested_inlines = []
+        for inline in self.inline_instances:
+            for nested in inline.inline_instances:
+                nested_inlines.append(nested)
+                for subnested in nested.inline_instances:
+                    subnested_inlines.append(subnested)
+        all_inlines = self.inline_instances + nested_inlines + subnested_inlines
+
-        inline_admin_formsets = []
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-        context = {
-            'title': _('Change %s') % force_unicode(opts.verbose_name),
@@ -759 +775 @@
-    template = None
-    verbose_name = None
-    verbose_name_plural = None
+    inlines = []
-
-    def __init__(self, parent_model, admin_site):
-        self.admin_site = admin_site
@@ -769 +786 @@
-            self.verbose_name = self.model._meta.verbose_name
-        if self.verbose_name_plural is None:
-            self.verbose_name_plural = self.model._meta.verbose_name_plural
-
+
+
+
+
+
-    def _media(self):
-        from django.conf import settings
-        js = []

django/contrib/admin/validation.py

@@ -137 +137 @@
-        raise ImproperlyConfigured("'%s.formset' does not inherit from "
-                "BaseModelFormSet." % cls.__name__)
-
+    # nested inlines = []
+    if hasattr(cls, 'inlines'):
+        check_isseq(cls, 'inlines', cls.inlines)
+        for idx, inline in enumerate(cls.inlines):
+            if not issubclass(inline, BaseModelAdmin):
+                raise ImproperlyConfigured("'%s.inlines[%d]' does not inherit "
+                        "from BaseModelAdmin." % (cls.__name__, idx))
+            if not inline.model:
+                raise ImproperlyConfigured("'model' is a required attribute "
+                        "of '%s.inlines[%d]'." % (cls.__name__, idx))
+            if not issubclass(inline.model, models.Model):
+                raise ImproperlyConfigured("'%s.inlines[%d].model' does not "
+                        "inherit from models.Model." % (cls.__name__, idx))
+            validate_base(inline, inline.model)
+            validate_inline(inline)
+
+
+
+
+
-def validate_base(cls, model):
-    opts = model._meta
-