From 14dc2b56bdcd91872be6753bcfb8d9786b8d0f40 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 8 Aug 2023 15:10:38 -0400 Subject: [PATCH] Rename object children generic template --- netbox/ipam/views.py | 8 ++++---- netbox/templates/dcim/device/consoleports.html | 2 +- netbox/templates/dcim/device/consoleserverports.html | 2 +- netbox/templates/dcim/device/devicebays.html | 2 +- netbox/templates/dcim/device/frontports.html | 2 +- netbox/templates/dcim/device/interfaces.html | 2 +- netbox/templates/dcim/device/inventory.html | 2 +- netbox/templates/dcim/device/modulebays.html | 2 +- netbox/templates/dcim/device/poweroutlets.html | 2 +- netbox/templates/dcim/device/powerports.html | 2 +- netbox/templates/dcim/device/rearports.html | 2 +- netbox/templates/dcim/rack/non_racked_devices.html | 2 +- netbox/templates/dcim/rack/reservations.html | 2 +- .../{objectchildren_list.html => object_children.html} | 0 netbox/templates/ipam/aggregate/prefixes.html | 2 +- netbox/templates/ipam/iprange/ip_addresses.html | 2 +- netbox/templates/ipam/prefix/ip_addresses.html | 2 +- netbox/templates/ipam/prefix/ip_ranges.html | 2 +- netbox/templates/ipam/prefix/prefixes.html | 2 +- netbox/templates/tenancy/object_contacts.html | 2 +- netbox/virtualization/views.py | 6 +++--- 21 files changed, 25 insertions(+), 25 deletions(-) rename netbox/templates/generic/{objectchildren_list.html => object_children.html} (100%) diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py index aacfc9069..d8e4d8b47 100644 --- a/netbox/ipam/views.py +++ b/netbox/ipam/views.py @@ -216,7 +216,7 @@ class ASNRangeASNsView(generic.ObjectChildrenView): child_model = ASN table = tables.ASNTable filterset = filtersets.ASNFilterSet - template_name = 'generic/objectchildren_list.html' + template_name = 'generic/object_children.html' tab = ViewTab( label=_('ASNs'), badge=lambda x: x.get_child_asns().count(), @@ -865,7 +865,7 @@ class IPAddressRelatedIPsView(generic.ObjectChildrenView): child_model = IPAddress table = tables.IPAddressTable filterset = filtersets.IPAddressFilterSet - template_name = 'generic/objectchildren_list.html' + template_name = 'generic/object_children.html' tab = ViewTab( label=_('Related IPs'), badge=lambda x: x.get_related_ips().count(), @@ -1075,7 +1075,7 @@ class VLANInterfacesView(generic.ObjectChildrenView): child_model = Interface table = tables.VLANDevicesTable filterset = InterfaceFilterSet - template_name = 'generic/objectchildren_list.html' + template_name = 'generic/object_children.html' tab = ViewTab( label=_('Device Interfaces'), badge=lambda x: x.get_interfaces().count(), @@ -1093,7 +1093,7 @@ class VLANVMInterfacesView(generic.ObjectChildrenView): child_model = VMInterface table = tables.VLANVirtualMachinesTable filterset = VMInterfaceFilterSet - template_name = 'generic/objectchildren_list.html' + template_name = 'generic/object_children.html' tab = ViewTab( label=_('VM Interfaces'), badge=lambda x: x.get_vminterfaces().count(), diff --git a/netbox/templates/dcim/device/consoleports.html b/netbox/templates/dcim/device/consoleports.html index a79f5af4f..65b2d4be0 100644 --- a/netbox/templates/dcim/device/consoleports.html +++ b/netbox/templates/dcim/device/consoleports.html @@ -1,4 +1,4 @@ -{% extends 'generic/objectchildren_list.html' %} +{% extends 'generic/object_children.html' %} {% load helpers %} {% block bulk_delete_controls %} diff --git a/netbox/templates/dcim/device/consoleserverports.html b/netbox/templates/dcim/device/consoleserverports.html index 3d7c444d6..b0b0c22bd 100644 --- a/netbox/templates/dcim/device/consoleserverports.html +++ b/netbox/templates/dcim/device/consoleserverports.html @@ -1,4 +1,4 @@ -{% extends 'generic/objectchildren_list.html' %} +{% extends 'generic/object_children.html' %} {% load helpers %} {% block bulk_delete_controls %} diff --git a/netbox/templates/dcim/device/devicebays.html b/netbox/templates/dcim/device/devicebays.html index f996278f6..9c86f81c6 100644 --- a/netbox/templates/dcim/device/devicebays.html +++ b/netbox/templates/dcim/device/devicebays.html @@ -1,4 +1,4 @@ -{% extends 'generic/objectchildren_list.html' %} +{% extends 'generic/object_children.html' %} {% block bulk_extra_controls %} {{ block.super }} diff --git a/netbox/templates/dcim/device/frontports.html b/netbox/templates/dcim/device/frontports.html index e2502ce10..182d83ba4 100644 --- a/netbox/templates/dcim/device/frontports.html +++ b/netbox/templates/dcim/device/frontports.html @@ -1,4 +1,4 @@ -{% extends 'generic/objectchildren_list.html' %} +{% extends 'generic/object_children.html' %} {% load helpers %} {% block bulk_delete_controls %} diff --git a/netbox/templates/dcim/device/interfaces.html b/netbox/templates/dcim/device/interfaces.html index 38167fe63..a9f1df2f4 100644 --- a/netbox/templates/dcim/device/interfaces.html +++ b/netbox/templates/dcim/device/interfaces.html @@ -1,4 +1,4 @@ -{% extends 'generic/objectchildren_list.html' %} +{% extends 'generic/object_children.html' %} {% load helpers %} {% block bulk_delete_controls %} diff --git a/netbox/templates/dcim/device/inventory.html b/netbox/templates/dcim/device/inventory.html index 73e64b14b..74c090da7 100644 --- a/netbox/templates/dcim/device/inventory.html +++ b/netbox/templates/dcim/device/inventory.html @@ -1,4 +1,4 @@ -{% extends 'generic/objectchildren_list.html' %} +{% extends 'generic/object_children.html' %} {% block bulk_extra_controls %} {{ block.super }} diff --git a/netbox/templates/dcim/device/modulebays.html b/netbox/templates/dcim/device/modulebays.html index 69a9539bf..370aa9b7c 100644 --- a/netbox/templates/dcim/device/modulebays.html +++ b/netbox/templates/dcim/device/modulebays.html @@ -1,4 +1,4 @@ -{% extends 'generic/objectchildren_list.html' %} +{% extends 'generic/object_children.html' %} {% block bulk_extra_controls %} {{ block.super }} diff --git a/netbox/templates/dcim/device/poweroutlets.html b/netbox/templates/dcim/device/poweroutlets.html index af076b23d..82f296060 100644 --- a/netbox/templates/dcim/device/poweroutlets.html +++ b/netbox/templates/dcim/device/poweroutlets.html @@ -1,4 +1,4 @@ -{% extends 'generic/objectchildren_list.html' %} +{% extends 'generic/object_children.html' %} {% load helpers %} {% block bulk_delete_controls %} diff --git a/netbox/templates/dcim/device/powerports.html b/netbox/templates/dcim/device/powerports.html index 01ee6fa62..3bd1c12eb 100644 --- a/netbox/templates/dcim/device/powerports.html +++ b/netbox/templates/dcim/device/powerports.html @@ -1,4 +1,4 @@ -{% extends 'generic/objectchildren_list.html' %} +{% extends 'generic/object_children.html' %} {% load helpers %} {% block bulk_delete_controls %} diff --git a/netbox/templates/dcim/device/rearports.html b/netbox/templates/dcim/device/rearports.html index d72515d25..e19b18c2f 100644 --- a/netbox/templates/dcim/device/rearports.html +++ b/netbox/templates/dcim/device/rearports.html @@ -1,4 +1,4 @@ -{% extends 'generic/objectchildren_list.html' %} +{% extends 'generic/object_children.html' %} {% load helpers %} {% block bulk_delete_controls %} diff --git a/netbox/templates/dcim/rack/non_racked_devices.html b/netbox/templates/dcim/rack/non_racked_devices.html index 0850eef8d..e52b8647f 100644 --- a/netbox/templates/dcim/rack/non_racked_devices.html +++ b/netbox/templates/dcim/rack/non_racked_devices.html @@ -1,4 +1,4 @@ -{% extends 'generic/objectchildren_list.html' %} +{% extends 'generic/object_children.html' %} {% block extra_controls %} {% if perms.dcim.add_device %} diff --git a/netbox/templates/dcim/rack/reservations.html b/netbox/templates/dcim/rack/reservations.html index 21de66cf6..a01cf3b7e 100644 --- a/netbox/templates/dcim/rack/reservations.html +++ b/netbox/templates/dcim/rack/reservations.html @@ -1,4 +1,4 @@ -{% extends 'generic/objectchildren_list.html' %} +{% extends 'generic/object_children.html' %} {% block extra_controls %} {% if perms.dcim.add_rackreservation %} diff --git a/netbox/templates/generic/objectchildren_list.html b/netbox/templates/generic/object_children.html similarity index 100% rename from netbox/templates/generic/objectchildren_list.html rename to netbox/templates/generic/object_children.html diff --git a/netbox/templates/ipam/aggregate/prefixes.html b/netbox/templates/ipam/aggregate/prefixes.html index e8f1dcf33..7820e121e 100644 --- a/netbox/templates/ipam/aggregate/prefixes.html +++ b/netbox/templates/ipam/aggregate/prefixes.html @@ -1,4 +1,4 @@ -{% extends 'generic/objectchildren_list.html' %} +{% extends 'generic/object_children.html' %} {% block extra_controls %} {% include 'ipam/inc/toggle_available.html' %} diff --git a/netbox/templates/ipam/iprange/ip_addresses.html b/netbox/templates/ipam/iprange/ip_addresses.html index 9f6503753..869fd0fa1 100644 --- a/netbox/templates/ipam/iprange/ip_addresses.html +++ b/netbox/templates/ipam/iprange/ip_addresses.html @@ -1,4 +1,4 @@ -{% extends 'generic/objectchildren_list.html' %} +{% extends 'generic/object_children.html' %} {% block extra_controls %} {% if perms.ipam.add_ipaddress and object.first_available_ip %} diff --git a/netbox/templates/ipam/prefix/ip_addresses.html b/netbox/templates/ipam/prefix/ip_addresses.html index 2fa33e4c2..f9d5febbe 100644 --- a/netbox/templates/ipam/prefix/ip_addresses.html +++ b/netbox/templates/ipam/prefix/ip_addresses.html @@ -1,4 +1,4 @@ -{% extends 'generic/objectchildren_list.html' %} +{% extends 'generic/object_children.html' %} {% block extra_controls %} {% if perms.ipam.add_ipaddress and first_available_ip %} diff --git a/netbox/templates/ipam/prefix/ip_ranges.html b/netbox/templates/ipam/prefix/ip_ranges.html index acd3f86b2..8371de81d 100644 --- a/netbox/templates/ipam/prefix/ip_ranges.html +++ b/netbox/templates/ipam/prefix/ip_ranges.html @@ -1,4 +1,4 @@ -{% extends 'generic/objectchildren_list.html' %} +{% extends 'generic/object_children.html' %} {% block extra_controls %} {% if perms.ipam.add_iprange and first_available_ip %} diff --git a/netbox/templates/ipam/prefix/prefixes.html b/netbox/templates/ipam/prefix/prefixes.html index 100c514ae..41407e870 100644 --- a/netbox/templates/ipam/prefix/prefixes.html +++ b/netbox/templates/ipam/prefix/prefixes.html @@ -1,4 +1,4 @@ -{% extends 'generic/objectchildren_list.html' %} +{% extends 'generic/object_children.html' %} {% block extra_controls %} {% include 'ipam/inc/toggle_available.html' %} diff --git a/netbox/templates/tenancy/object_contacts.html b/netbox/templates/tenancy/object_contacts.html index ae3a398d1..95727604c 100644 --- a/netbox/templates/tenancy/object_contacts.html +++ b/netbox/templates/tenancy/object_contacts.html @@ -1,4 +1,4 @@ -{% extends 'generic/objectchildren_list.html' %} +{% extends 'generic/object_children.html' %} {% load helpers %} {% block extra_controls %} diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py index 0fdf15197..41eefc8ac 100644 --- a/netbox/virtualization/views.py +++ b/netbox/virtualization/views.py @@ -175,7 +175,7 @@ class ClusterVirtualMachinesView(generic.ObjectChildrenView): child_model = VirtualMachine table = tables.VirtualMachineTable filterset = filtersets.VirtualMachineFilterSet - template_name = 'generic/objectchildren_list.html' + template_name = 'generic/object_children.html' tab = ViewTab( label=_('Virtual Machines'), badge=lambda obj: obj.virtual_machines.count(), @@ -193,7 +193,7 @@ class ClusterDevicesView(generic.ObjectChildrenView): child_model = Device table = DeviceTable filterset = DeviceFilterSet - template_name = 'generic/objectchildren_list.html' + template_name = 'generic/object_children.html' tab = ViewTab( label=_('Devices'), badge=lambda obj: obj.devices.count(), @@ -346,7 +346,7 @@ class VirtualMachineInterfacesView(generic.ObjectChildrenView): child_model = VMInterface table = tables.VirtualMachineVMInterfaceTable filterset = filtersets.VMInterfaceFilterSet - template_name = 'generic/objectchildren_list.html' + template_name = 'generic/object_children.html' tab = ViewTab( label=_('Interfaces'), badge=lambda obj: obj.interfaces.count(),