Merge pull request #267 from theatlantic/fix/skip-inlines

Fix prefix increment for polymorphic forms - INT-3275

Author: felton

nested_admin/nested.py

@@ -363,11 +363,6 @@ def _create_formsets(self, request, obj, change):
                         is_empty_form = True
                     InlineFormSet = inline.get_formset(request, form_obj)
 
-                    prefix = '%s-%s' % (form_prefix, InlineFormSet.get_default_prefix())
-                    prefixes[prefix] = prefixes.get(prefix, 0) + 1
-                    if prefixes[prefix] != 1:
-                        prefix = "%s-%s" % (prefix, prefixes[prefix])
-
                     # Check if we're dealing with a polymorphic instance, and if
                     # so, skip inlines for other child models
                     if hasattr(form_obj, 'get_real_instance'):
@@ -378,6 +373,11 @@ def _create_formsets(self, request, obj, change):
                         if not isinstance(form_obj, inline.parent_model):
                             continue
 
+                    prefix = '%s-%s' % (form_prefix, InlineFormSet.get_default_prefix())
+                    prefixes[prefix] = prefixes.get(prefix, 0) + 1
+                    if prefixes[prefix] != 1:
+                        prefix = "%s-%s" % (prefix, prefixes[prefix])
+
                     formset_params = {
                         'instance': form_obj,
                         'prefix': prefix,