From 4bb9363e81146df7a990a9f8f0c8f32a7c87f285 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Thu, 16 Jun 2016 09:27:33 -0400
Subject: [PATCH] Fixed bug where placeholder prefixes were being included as
 'None' in pk_all for bulk edit/delete

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

diff --git a/netbox/templates/dcim/inc/device_table.html b/netbox/templates/dcim/inc/device_table.html
index 716c39e0a..38ab5fe36 100644
--- a/netbox/templates/dcim/inc/device_table.html
+++ b/netbox/templates/dcim/inc/device_table.html
@@ -4,7 +4,7 @@
     <form method="post" class="form form-horizontal">
         {% csrf_token %}
         <input type="hidden" name="redirect_url" value="{{ request.path }}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" />
-        <input type="hidden" name="pk_all" value="{% for row in table.rows %}{{ row.record.pk }}{% if not forloop.last %},{% endif %}{% endfor %}" />
+        <input type="hidden" name="pk_all" value="{% for row in table.rows %}{{ row.record.pk|default:'' }}{% if not forloop.last %},{% endif %}{% endfor %}" />
         {% render_table table table_template|default:'table.html' %}
         {% if perms.dcim.add_interface %}
             <button type="submit" name="_edit" formaction="{% url 'dcim:interface_bulk_add' %}" class="btn btn-primary btn-sm">
diff --git a/netbox/templates/utilities/obj_table.html b/netbox/templates/utilities/obj_table.html
index 01188a93a..eaad9c5b3 100644
--- a/netbox/templates/utilities/obj_table.html
+++ b/netbox/templates/utilities/obj_table.html
@@ -4,7 +4,7 @@
     <form method="post" class="form form-horizontal">
         {% csrf_token %}
         <input type="hidden" name="redirect_url" value="{{ request.path }}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" />
-        <input type="hidden" name="pk_all" value="{% for row in table.rows %}{{ row.record.pk }}{% if not forloop.last %},{% endif %}{% endfor %}" />
+        <input type="hidden" name="pk_all" value="{% for row in table.rows %}{{ row.record.pk|default:'' }}{% if not forloop.last %},{% endif %}{% endfor %}" />
         {% render_table table table_template|default:'table.html' %}
         {% if bulk_edit_url and table.model|user_can_change:request.user %}
             <button type="submit" name="_edit" formaction="{% url bulk_edit_url %}" class="btn btn-warning btn-sm">
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index 939da5e75..e849ac163 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -261,7 +261,7 @@ class BulkEditView(View):
             redirect_url = reverse(self.default_redirect_url)
 
         if request.POST.get('_all'):
-            pk_list = request.POST.get('pk_all').split(',')
+            pk_list = [x for x in request.POST.get('pk_all').split(',') if x]
         else:
             pk_list = request.POST.getlist('pk')
 
@@ -318,7 +318,7 @@ class BulkDeleteView(View):
             redirect_url = reverse(self.default_redirect_url)
 
         if request.POST.get('_all'):
-            pk_list = request.POST.get('pk_all').split(',')
+            pk_list = [x for x in request.POST.get('pk_all').split(',') if x]
         else:
             pk_list = request.POST.getlist('pk')