From 71a74e410df72962b207800bda2ba5881f0c610b Mon Sep 17 00:00:00 2001
From: Arthur <worldnomad@gmail.com>
Date: Fri, 19 May 2023 09:40:13 -0700
Subject: [PATCH] 12552 test fixes

---
 ...ventoryitem_level_remove_inventoryitem_lft_and_more.py | 8 ++++++++
 netbox/dcim/models/device_component_templates.py          | 2 +-
 netbox/dcim/models/device_components.py                   | 1 -
 netbox/dcim/models/sites.py                               | 2 +-
 netbox/dcim/tables/devices.py                             | 2 +-
 netbox/templates/dcim/site.html                           | 2 +-
 netbox/utilities/utils.py                                 | 4 ++--
 .../0009_remove_wirelesslangroup_level_and_more.py        | 4 ++++
 netbox/wireless/models.py                                 | 2 +-
 9 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/netbox/dcim/migrations/0174_remove_inventoryitem_level_remove_inventoryitem_lft_and_more.py b/netbox/dcim/migrations/0174_remove_inventoryitem_level_remove_inventoryitem_lft_and_more.py
index c1f9c4bc2..fb3417816 100644
--- a/netbox/dcim/migrations/0174_remove_inventoryitem_level_remove_inventoryitem_lft_and_more.py
+++ b/netbox/dcim/migrations/0174_remove_inventoryitem_level_remove_inventoryitem_lft_and_more.py
@@ -149,4 +149,12 @@ class Migration(migrations.Migration):
             name='inventoryitem',
             options={'ordering': ('_name',)},
         ),
+        migrations.AlterModelOptions(
+            name='inventoryitemtemplate',
+            options={'ordering': ('_name',)},
+        ),
+        migrations.AlterModelOptions(
+            name='location',
+            options={'ordering': ('name',)},
+        ),
     ]
diff --git a/netbox/dcim/models/device_component_templates.py b/netbox/dcim/models/device_component_templates.py
index a36400fcb..c6f629507 100644
--- a/netbox/dcim/models/device_component_templates.py
+++ b/netbox/dcim/models/device_component_templates.py
@@ -663,7 +663,7 @@ class InventoryItemTemplate(TreeNode, ComponentTemplateModel):
     component_model = InventoryItem
 
     class Meta:
-        ordering = ('device_type__id', 'parent__id', '_name')
+        ordering = ('_name', )
         constraints = (
             models.UniqueConstraint(
                 fields=('device_type', 'parent', 'name'),
diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py
index 51d10542e..938aa731c 100644
--- a/netbox/dcim/models/device_components.py
+++ b/netbox/dcim/models/device_components.py
@@ -1128,7 +1128,6 @@ class InventoryItem(TreeNode, ComponentModel):
     clone_fields = ('device', 'parent', 'role', 'manufacturer', 'part_id',)
 
     class Meta:
-        # ordering = ('device__id', 'parent__id', '_name')
         ordering = ('_name', )
         constraints = (
             models.UniqueConstraint(
diff --git a/netbox/dcim/models/sites.py b/netbox/dcim/models/sites.py
index 43c47a359..8a2e732d9 100644
--- a/netbox/dcim/models/sites.py
+++ b/netbox/dcim/models/sites.py
@@ -294,7 +294,7 @@ class Location(NestedGroupModel):
     )
 
     class Meta:
-        ordering = ['site', 'name']
+        ordering = ('name', )
         constraints = (
             models.UniqueConstraint(
                 fields=('site', 'parent', 'name'),
diff --git a/netbox/dcim/tables/devices.py b/netbox/dcim/tables/devices.py
index a0238a1fb..7f0c25005 100644
--- a/netbox/dcim/tables/devices.py
+++ b/netbox/dcim/tables/devices.py
@@ -857,7 +857,7 @@ class InventoryItemTable(DeviceComponentTable):
 
 class DeviceInventoryItemTable(InventoryItemTable):
     name = tables.TemplateColumn(
-        template_code='<a href="{{ record.get_absolute_url }}" style="padding-left: {{ record.level }}0px">'
+        template_code='<a href="{{ record.get_absolute_url }}" style="padding-left: {{ record.tree_depth }}0px">'
                       '{{ value }}</a>',
         order_by=Accessor('_name'),
         attrs={'td': {'class': 'text-nowrap'}}
diff --git a/netbox/templates/dcim/site.html b/netbox/templates/dcim/site.html
index 697737ceb..afc387e7f 100644
--- a/netbox/templates/dcim/site.html
+++ b/netbox/templates/dcim/site.html
@@ -145,7 +145,7 @@
               {% for location in locations %}
                 <tr>
                   <td>
-                    {% for i in location.level|as_range %}<i class="mdi mdi-circle-small"></i>{% endfor %}
+                    {% for i in location.tree_depth|as_range %}<i class="mdi mdi-circle-small"></i>{% endfor %}
                     {{ location|linkify }}
                   </td>
                   <td>
diff --git a/netbox/utilities/utils.py b/netbox/utilities/utils.py
index c4a02e861..f280fd837 100644
--- a/netbox/utilities/utils.py
+++ b/netbox/utilities/utils.py
@@ -155,8 +155,8 @@ def serialize_object(obj, resolve_tags=True, extra=None):
 
     # Exclude any TreeNode fields
     if issubclass(obj.__class__, TreeNode):
-        for field in ['level', 'lft', 'rght', 'tree_id']:
-            data.pop(field)
+        for field in ['tree_depth', 'tree_path', 'tree_ordering']:
+            data.pop(field, None)
 
     # Include custom_field_data as "custom_fields"
     if hasattr(obj, 'custom_field_data'):
diff --git a/netbox/wireless/migrations/0009_remove_wirelesslangroup_level_and_more.py b/netbox/wireless/migrations/0009_remove_wirelesslangroup_level_and_more.py
index 6612b63f3..b37ca1ec5 100644
--- a/netbox/wireless/migrations/0009_remove_wirelesslangroup_level_and_more.py
+++ b/netbox/wireless/migrations/0009_remove_wirelesslangroup_level_and_more.py
@@ -37,4 +37,8 @@ class Migration(migrations.Migration):
                 to='wireless.wirelesslangroup',
             ),
         ),
+        migrations.AlterModelOptions(
+            name='wirelesslangroup',
+            options={'ordering': ('name',), 'verbose_name': 'Wireless LAN Group'},
+        ),
     ]
diff --git a/netbox/wireless/models.py b/netbox/wireless/models.py
index 23fcee308..c5afca687 100644
--- a/netbox/wireless/models.py
+++ b/netbox/wireless/models.py
@@ -54,7 +54,7 @@ class WirelessLANGroup(NestedGroupModel):
     )
 
     class Meta:
-        ordering = ('name', 'pk')
+        ordering = ('name', )
         constraints = (
             models.UniqueConstraint(
                 fields=('parent', 'name'),