From fcd407d10bbff902adfd44d3f1af1f86afe6675f Mon Sep 17 00:00:00 2001
From: dansheps <dans@dansheps.com>
Date: Mon, 6 May 2019 14:14:29 -0500
Subject: [PATCH] Fix field ordering

---
 netbox/dcim/forms.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index 3d6e7b833..db92bcdf3 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -1647,6 +1647,11 @@ class DeviceBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEditF
 
 class DeviceFilterForm(BootstrapMixin, LocalConfigContextFilterForm, CustomFieldFilterForm):
     model = Device
+    # Order the form fields, fields not listed are appended
+    field_order = ['q', 'region', 'site', 'rack_group_id', 'rack_id', 'role', 'tenant', 'manufacturer_id',
+                   'device_type_id', 'platform', 'status', 'mac_address', 'has_primary_ip', 'console_ports',
+                   'console_server_ports', 'power_ports', 'power_outlets', 'interfaces', 'pass_through_ports']
+
     q = forms.CharField(
         required=False,
         label='Search'
@@ -1804,6 +1809,8 @@ class DeviceFilterForm(BootstrapMixin, LocalConfigContextFilterForm, CustomField
     )
 
 
+
+
 #
 # Bulk device component creation
 #