Browse Source

Fixes #1191: Bulk selection of IPs under a prefix incorrect when "select all" is used

Jeremy Stretch 8 years ago
parent
commit
3bc51c8e69
3 changed files with 3 additions and 3 deletions
  1. 1 0
      netbox/ipam/views.py
  2. 2 2
      netbox/templates/utilities/obj_table.html
  3. 0 1
      netbox/utilities/views.py

+ 1 - 0
netbox/ipam/views.py

@@ -525,6 +525,7 @@ def prefix_ipaddresses(request, pk):
         'prefix': prefix,
         'prefix': prefix,
         'ip_table': ip_table,
         'ip_table': ip_table,
         'permissions': permissions,
         'permissions': permissions,
+        'bulk_querystring': 'vrf_id={}&parent={}'.format(prefix.vrf or '0', prefix.prefix),
     })
     })
 
 
 
 

+ 2 - 2
netbox/templates/utilities/obj_table.html

@@ -14,12 +14,12 @@
                     </div>
                     </div>
                     <div class="pull-right">
                     <div class="pull-right">
                         {% if bulk_edit_url and permissions.change %}
                         {% 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
                                 <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Edit All
                             </button>
                             </button>
                         {% endif %}
                         {% endif %}
                         {% if bulk_delete_url and permissions.delete %}
                         {% 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
                                 <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Delete All
                             </button>
                             </button>
                         {% endif %}
                         {% endif %}

+ 0 - 1
netbox/utilities/views.py

@@ -4,7 +4,6 @@ from django_tables2 import RequestConfig
 from django.conf import settings
 from django.conf import settings
 from django.contrib import messages
 from django.contrib import messages
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes.models import ContentType
-from django.core.exceptions import ValidationError
 from django.db import transaction, IntegrityError
 from django.db import transaction, IntegrityError
 from django.db.models import ProtectedError
 from django.db.models import ProtectedError
 from django.forms import CharField, ModelMultipleChoiceField, MultipleHiddenInput, TypedChoiceField
 from django.forms import CharField, ModelMultipleChoiceField, MultipleHiddenInput, TypedChoiceField