From 905d17294a2b14b7addf1dee57540fdd4c28edcc Mon Sep 17 00:00:00 2001
From: Arthur <worldnomad@gmail.com>
Date: Wed, 28 Jan 2026 17:27:01 -0800
Subject: [PATCH] Review feedback

---
 .../migrations/0226_modulebay_rebuild_tree.py     | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/netbox/dcim/migrations/0226_modulebay_rebuild_tree.py b/netbox/dcim/migrations/0226_modulebay_rebuild_tree.py
index c5671eabe..1315b701b 100644
--- a/netbox/dcim/migrations/0226_modulebay_rebuild_tree.py
+++ b/netbox/dcim/migrations/0226_modulebay_rebuild_tree.py
@@ -1,12 +1,23 @@
 from django.db import migrations
 import mptt.managers
+import mptt.models
 
 
 def rebuild_mptt(apps, schema_editor):
-    manager = mptt.managers.TreeManager()
+    """
+    Rebuild the MPTT tree for ModuleBay to apply new ordering.
+    """
     ModuleBay = apps.get_model('dcim', 'ModuleBay')
+
+    # Set MPTTMeta with the correct order_insertion_by
+    class MPTTMeta:
+        order_insertion_by = ('module', 'name',)
+
+    ModuleBay.MPTTMeta = MPTTMeta
+    ModuleBay._mptt_meta = mptt.models.MPTTOptions(MPTTMeta)
+
+    manager = mptt.managers.TreeManager()
     manager.model = ModuleBay
-    mptt.register(ModuleBay)
     manager.contribute_to_class(ModuleBay, 'objects')
     manager.rebuild()