From 33514d78b4109b3c416914200358571b85e40c11 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@netboxlabs.com>
Date: Mon, 5 Aug 2024 11:29:08 -0400
Subject: [PATCH] Misc cleanup

---
 netbox/dcim/models/devices.py | 29 ++++++++++++++++-------------
 netbox/dcim/tables/devices.py |  4 ----
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/netbox/dcim/models/devices.py b/netbox/dcim/models/devices.py
index 7b470bb2b..c281e5de2 100644
--- a/netbox/dcim/models/devices.py
+++ b/netbox/dcim/models/devices.py
@@ -1270,19 +1270,22 @@ class Module(PrimaryModel, ConfigContextModel):
                 if not disable_replication:
                     create_instances.append(template_instance)
 
-            # component_model.objects.bulk_create(create_instances)
-            # # Emit the post_save signal for each newly created object
-            # for component in create_instances:
-            #     post_save.send(
-            #         sender=component_model,
-            #         instance=component,
-            #         created=True,
-            #         raw=False,
-            #         using='default',
-            #         update_fields=None
-            #     )
-            for instance in create_instances:
-                instance.save()
+            if component_model is not ModuleBay:
+                component_model.objects.bulk_create(create_instances)
+                # Emit the post_save signal for each newly created object
+                for component in create_instances:
+                    post_save.send(
+                        sender=component_model,
+                        instance=component,
+                        created=True,
+                        raw=False,
+                        using='default',
+                        update_fields=None
+                    )
+            else:
+                # ModuleBays must be saved individually for MPTT
+                for instance in create_instances:
+                    instance.save()
 
             update_fields = ['module']
             component_model.objects.bulk_update(update_instances, update_fields)
diff --git a/netbox/dcim/tables/devices.py b/netbox/dcim/tables/devices.py
index 6c292cc79..5ac2e1cc7 100644
--- a/netbox/dcim/tables/devices.py
+++ b/netbox/dcim/tables/devices.py
@@ -313,10 +313,6 @@ class ModularDeviceComponentTable(DeviceComponentTable):
         verbose_name=_('Inventory Items'),
     )
 
-    class Meta(NetBoxTable.Meta):
-        pass
-        # order_by = ('device', 'module', 'name')
-
 
 class CableTerminationTable(NetBoxTable):
     cable = tables.Column(