From f927d5b8f552738af6e22b3d8156ca3d831cb666 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Thu, 18 May 2017 14:27:07 -0400
Subject: [PATCH] Closes #1198: Allow filtering unracked devices on device list

---
 netbox/dcim/forms.py                   | 4 +++-
 netbox/templates/dcim/device_list.html | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index ca0d13f21..c110f1d47 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -821,13 +821,15 @@ class DeviceFilterForm(BootstrapMixin, CustomFieldFilterForm):
     rack_id = FilterChoiceField(
         queryset=Rack.objects.annotate(filter_count=Count('devices')),
         label='Rack',
+        null_option=(0, 'None'),
     )
     role = FilterChoiceField(
         queryset=DeviceRole.objects.annotate(filter_count=Count('devices')),
         to_field_name='slug',
     )
     tenant = FilterChoiceField(
-        queryset=Tenant.objects.annotate(filter_count=Count('devices')), to_field_name='slug',
+        queryset=Tenant.objects.annotate(filter_count=Count('devices')),
+        to_field_name='slug',
         null_option=(0, 'None'),
     )
     manufacturer_id = FilterChoiceField(queryset=Manufacturer.objects.all(), label='Manufacturer')
diff --git a/netbox/templates/dcim/device_list.html b/netbox/templates/dcim/device_list.html
index 211317bcf..392679348 100644
--- a/netbox/templates/dcim/device_list.html
+++ b/netbox/templates/dcim/device_list.html
@@ -76,6 +76,7 @@ $(document).ready(function() {
 
             // Update rack options
             rack_list.empty();
+            rack_list.append($("<option></option>").attr("value", "0").text("None"));
             $.ajax({
                 url: netbox_api_path + 'dcim/racks/?limit=500&site=' + selected_sites.join('&site='),
                 dataType: 'json',