From ed8fdd9292c902b4440e7f4584a149bc8416d5a4 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Tue, 24 Jan 2017 09:50:51 -0500
Subject: [PATCH] Fixes #816: Redirect back to parent prefix view after
 deleting child prefixes

---
 netbox/ipam/views.py                      | 1 +
 netbox/templates/utilities/obj_table.html | 2 +-
 netbox/utilities/views.py                 | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index 9682dff50..3d2c93a1f 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -437,6 +437,7 @@ def prefix(request, pk):
         'parent_prefix_table': parent_prefix_table,
         'child_prefix_table': child_prefix_table,
         'duplicate_prefix_table': duplicate_prefix_table,
+        'return_url': prefix.get_absolute_url(),
     })
 
 
diff --git a/netbox/templates/utilities/obj_table.html b/netbox/templates/utilities/obj_table.html
index 7144047fd..4458783b2 100644
--- a/netbox/templates/utilities/obj_table.html
+++ b/netbox/templates/utilities/obj_table.html
@@ -3,7 +3,7 @@
 {% if table.model|user_can_change:request.user or table.model|user_can_delete:request.user %}
     <form method="post" class="form form-horizontal">
         {% csrf_token %}
-        <input type="hidden" name="return_url" value="{{ request.path }}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" />
+        <input type="hidden" name="return_url" value="{% if return_url %}{{ return_url }}{% else %}{{ request.path }}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}{% endif %}" />
         {% if table.paginator.num_pages > 1 %}
             <div id="select_all_box" class="hidden panel panel-default">
                 <div class="panel-body">
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index d1af80291..482ce5405 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -3,7 +3,7 @@ from django_tables2 import RequestConfig
 
 from django.contrib import messages
 from django.contrib.contenttypes.models import ContentType
-from django.core.exceptions import ImproperlyConfigured, ValidationError
+from django.core.exceptions import ValidationError
 from django.core.urlresolvers import reverse
 from django.db import transaction, IntegrityError
 from django.db.models import ProtectedError
@@ -590,7 +590,7 @@ class BulkDeleteView(View):
                 return redirect(return_url)
 
         else:
-            form = form_cls(initial={'pk': pk_list})
+            form = form_cls(initial={'pk': pk_list, 'return_url': return_url})
 
         selected_objects = self.cls.objects.filter(pk__in=pk_list)
         if not selected_objects: