From 3bc51c8e69e3bbcb911f57ab40db0a8d4b6e5d40 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Wed, 17 May 2017 14:23:08 -0400
Subject: [PATCH] Fixes #1191: Bulk selection of IPs under a prefix incorrect
 when "select all" is used

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

diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index 255e449a0..82e5f8331 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -525,6 +525,7 @@ def prefix_ipaddresses(request, pk):
         'prefix': prefix,
         'ip_table': ip_table,
         'permissions': permissions,
+        'bulk_querystring': 'vrf_id={}&parent={}'.format(prefix.vrf or '0', prefix.prefix),
     })
 
 
diff --git a/netbox/templates/utilities/obj_table.html b/netbox/templates/utilities/obj_table.html
index a57773222..058c7ef07 100644
--- a/netbox/templates/utilities/obj_table.html
+++ b/netbox/templates/utilities/obj_table.html
@@ -14,12 +14,12 @@
                     </div>
                     <div class="pull-right">
                         {% if bulk_edit_url and permissions.change %}
-                            <button type="submit" name="_edit" formaction="{% url bulk_edit_url %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-warning btn-sm" disabled="disabled">
+                            <button type="submit" name="_edit" formaction="{% url bulk_edit_url %}{% if bulk_querystring %}?{{ bulk_querystring }}{% elif request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-warning btn-sm" disabled="disabled">
                                 <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Edit All
                             </button>
                         {% endif %}
                         {% if bulk_delete_url and permissions.delete %}
-                            <button type="submit" name="_delete" formaction="{% url bulk_delete_url %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-danger btn-sm" disabled="disabled">
+                            <button type="submit" name="_delete" formaction="{% url bulk_delete_url %}{% if bulk_querystring %}?{{ bulk_querystring }}{% elif request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-danger btn-sm" disabled="disabled">
                                 <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Delete All
                             </button>
                         {% endif %}
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index 861977c31..d61a55e66 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -4,7 +4,6 @@ from django_tables2 import RequestConfig
 from django.conf import settings
 from django.contrib import messages
 from django.contrib.contenttypes.models import ContentType
-from django.core.exceptions import ValidationError
 from django.db import transaction, IntegrityError
 from django.db.models import ProtectedError
 from django.forms import CharField, ModelMultipleChoiceField, MultipleHiddenInput, TypedChoiceField