Fixed Django 1.9 deprecation warnings.

nested_inline/__init__.py

@@ -1 +1 @@
-__version__ = (0,  3, 5)
+__version__ = (0, 3, 5, 1)

nested_inline/admin.py

@@ -44,8 +44,9 @@ def get_inline_instances(self, request, obj=None):
     def save_formset(self, request, form, formset, change):
         """
         Given an inline formset save it to the database.
+        self.saved_related_instances can be used in child class overridden save_formset().
         """
-        instances = formset.save()
+        self.saved_related_instances = formset.save()
 
         for form in formset.forms:
             if hasattr(form, 'nested_formsets') and form not in formset.deleted_forms:
@@ -155,7 +156,7 @@ def add_view(self, request, form_url='', extra_context=None):
 
         ModelForm = self.get_form(request)
         formsets = []
-        inline_instances = self.get_inline_instances(request, None)
+        inline_instances = []
         if request.method == 'POST':
             form = ModelForm(request.POST, request.FILES)
             if form.is_valid():
@@ -165,7 +166,7 @@ def add_view(self, request, form_url='', extra_context=None):
                 form_validated = False
                 new_object = self.model()
             prefixes = {}
-            for FormSet, inline in zip(self.get_formsets(request), inline_instances):
+            for FormSet, inline in self.get_formsets_with_inlines(request):
                 prefix = FormSet.get_default_prefix()
                 prefixes[prefix] = prefixes.get(prefix, 0) + 1
                 if prefixes[prefix] != 1 or not prefix:
@@ -175,6 +176,7 @@ def add_view(self, request, form_url='', extra_context=None):
                     save_as_new="_saveasnew" in request.POST,
                     prefix=prefix, queryset=inline.get_queryset(request))
                 formsets.append(formset)
+                inline_instances.append(inline)
                 if inline.inlines:
                     self.add_nested_inline_formsets(request, inline, formset)
             if self.all_valid_with_nesting(formsets) and form_validated:
@@ -195,14 +197,15 @@ def add_view(self, request, form_url='', extra_context=None):
                     initial[k] = initial[k].split(",")
             form = ModelForm(initial=initial)
             prefixes = {}
-            for FormSet, inline in zip(self.get_formsets(request), inline_instances):
+            for FormSet, inline in self.get_formsets_with_inlines(request):
                 prefix = FormSet.get_default_prefix()
                 prefixes[prefix] = prefixes.get(prefix, 0) + 1
                 if prefixes[prefix] != 1 or not prefix:
                     prefix = "%s-%s" % (prefix, prefixes[prefix])
                 formset = FormSet(instance=self.model(), prefix=prefix,
                     queryset=inline.get_queryset(request))
                 formsets.append(formset)
+                inline_instances.append(inline)
                 if hasattr(inline, 'inlines') and inline.inlines:
                     self.add_nested_inline_formsets(request, inline, formset)
 
@@ -227,7 +230,7 @@ def add_view(self, request, form_url='', extra_context=None):
         context = {
             'title': _('Add %s') % force_text(opts.verbose_name),
             'adminform': adminForm,
-            'is_popup': "_popup" in request.REQUEST,
+            'is_popup': "_popup" in request.GET or "_popup" in request.POST,
             'show_delete': False,
             'media': media,
             'inline_admin_formsets': inline_admin_formsets,
@@ -259,7 +262,7 @@ def change_view(self, request, object_id, form_url='', extra_context=None):
 
         ModelForm = self.get_form(request, obj)
         formsets = []
-        inline_instances = self.get_inline_instances(request, obj)
+        inline_instances = []
         if request.method == 'POST':
             form = ModelForm(request.POST, request.FILES, instance=obj)
             if form.is_valid():
@@ -269,7 +272,7 @@ def change_view(self, request, object_id, form_url='', extra_context=None):
                 form_validated = False
                 new_object = obj
             prefixes = {}
-            for FormSet, inline in zip(self.get_formsets(request, new_object), inline_instances):
+            for FormSet, inline in self.get_formsets_with_inlines(request, new_object):
                 prefix = FormSet.get_default_prefix()
                 prefixes[prefix] = prefixes.get(prefix, 0) + 1
                 if prefixes[prefix] != 1 or not prefix:
@@ -278,6 +281,7 @@ def change_view(self, request, object_id, form_url='', extra_context=None):
                     instance=new_object, prefix=prefix,
                     queryset=inline.get_queryset(request))
                 formsets.append(formset)
+                inline_instances.append(inline)
                 if hasattr(inline, 'inlines') and inline.inlines:
                     self.add_nested_inline_formsets(request, inline, formset)
 
@@ -291,14 +295,15 @@ def change_view(self, request, object_id, form_url='', extra_context=None):
         else:
             form = ModelForm(instance=obj)
             prefixes = {}
-            for FormSet, inline in zip(self.get_formsets(request, obj), inline_instances):
+            for FormSet, inline in self.get_formsets_with_inlines(request, obj):
                 prefix = FormSet.get_default_prefix()
                 prefixes[prefix] = prefixes.get(prefix, 0) + 1
                 if prefixes[prefix] != 1 or not prefix:
                     prefix = "%s-%s" % (prefix, prefixes[prefix])
                 formset = FormSet(instance=obj, prefix=prefix,
                     queryset=inline.get_queryset(request))
                 formsets.append(formset)
+                inline_instances.append(inline)
                 if hasattr(inline, 'inlines') and inline.inlines:
                     self.add_nested_inline_formsets(request, inline, formset)
 
@@ -325,7 +330,7 @@ def change_view(self, request, object_id, form_url='', extra_context=None):
             'adminform': adminForm,
             'object_id': object_id,
             'original': obj,
-            'is_popup': "_popup" in request.REQUEST,
+            'is_popup': "_popup" in request.GET or "_popup" in request.POST,
             'media': media,
             'inline_admin_formsets': inline_admin_formsets,
             'errors': helpers.AdminErrorList(form, formsets),
@@ -364,8 +369,12 @@ def get_inline_instances(self, request, obj=None):
             inline_instances.append(inline)
         return inline_instances
 
+    def get_formsets_with_inlines(self, request, obj=None):
+        for inline in self.get_inline_instances(request, obj):
+            yield inline.get_formset(request, obj), inline
+
     def get_formsets(self, request, obj=None):
-        for inline in self.get_inline_instances(request):
+        for inline in self.get_inline_instances(request, obj):
             yield inline.get_formset(request, obj)
 
 

nested_inline/static/admin/js/inlines-nested.js

@@ -100,6 +100,7 @@
                     // If a post-delete callback was provided, call it with the deleted form:
                     if (options.removed) {
                         options.removed(formset_to_update);
+                        $(document).trigger('formset:removed', [row, options.prefix]);
                     }
                 });
                 if (row.is("tr")) {
@@ -131,6 +132,7 @@
                 // If a post-add callback was supplied, call it with the added form:
                 if (options.added) {
                     options.added(row);
+                    $(document).trigger('formset:added', [row, options.prefix]);
                 }
                 nextIndex = nextIndex + 1;
             });