From fa268381cd305589b92bb06c0da200337a4b1544 Mon Sep 17 00:00:00 2001 From: Abhimanyu Saharan Date: Tue, 9 May 2023 21:56:00 +0530 Subject: [PATCH] changes as per review --- netbox/circuits/views.py | 8 ++++---- netbox/dcim/views.py | 18 +++++++++--------- netbox/ipam/views.py | 4 ++-- netbox/tenancy/views.py | 2 +- netbox/virtualization/views.py | 8 ++++---- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/netbox/circuits/views.py b/netbox/circuits/views.py index b74874faf..f1cfdd1d5 100644 --- a/netbox/circuits/views.py +++ b/netbox/circuits/views.py @@ -4,7 +4,7 @@ from django.shortcuts import get_object_or_404, redirect, render from dcim.views import PathTraceView from netbox.views import generic -from tenancy.views import ChildContactView +from tenancy.views import ObjectContactsView from utilities.forms import ConfirmationForm from utilities.utils import count_related from utilities.views import register_model_view @@ -74,7 +74,7 @@ class ProviderBulkDeleteView(generic.BulkDeleteView): @register_model_view(Provider, 'contacts') -class ProviderContactsView(ChildContactView): +class ProviderContactsView(ObjectContactsView): queryset = Provider.objects.all() @@ -140,7 +140,7 @@ class ProviderAccountBulkDeleteView(generic.BulkDeleteView): @register_model_view(ProviderAccount, 'contacts') -class ProviderAccountContactsView(ChildContactView): +class ProviderAccountContactsView(ObjectContactsView): queryset = ProviderAccount.objects.all() @@ -400,7 +400,7 @@ class CircuitSwapTerminations(generic.ObjectEditView): @register_model_view(Circuit, 'contacts') -class CircuitContactsView(ChildContactView): +class CircuitContactsView(ObjectContactsView): queryset = Circuit.objects.all() diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index c46e33095..0def4f4a8 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -20,7 +20,7 @@ from extras.views import ObjectConfigContextView from ipam.models import ASN, IPAddress, Prefix, VLAN, VLANGroup from ipam.tables import InterfaceVLANTable from netbox.views import generic -from tenancy.views import ChildContactView +from tenancy.views import ObjectContactsView from utilities.forms import ConfirmationForm from utilities.paginator import EnhancedPaginator, get_paginate_count from utilities.permissions import get_permission_for_model @@ -269,7 +269,7 @@ class RegionBulkDeleteView(generic.BulkDeleteView): @register_model_view(Region, 'contacts') -class RegionContactsView(ChildContactView): +class RegionContactsView(ObjectContactsView): queryset = Region.objects.all() @@ -349,7 +349,7 @@ class SiteGroupBulkDeleteView(generic.BulkDeleteView): @register_model_view(SiteGroup, 'contacts') -class SiteGroupContactsView(ChildContactView): +class SiteGroupContactsView(ObjectContactsView): queryset = SiteGroup.objects.all() @@ -447,7 +447,7 @@ class SiteBulkDeleteView(generic.BulkDeleteView): @register_model_view(Site, 'contacts') -class SiteContactsView(ChildContactView): +class SiteContactsView(ObjectContactsView): queryset = Site.objects.all() @@ -540,7 +540,7 @@ class LocationBulkDeleteView(generic.BulkDeleteView): @register_model_view(Location, 'contacts') -class LocationContactsView(ChildContactView): +class LocationContactsView(ObjectContactsView): queryset = Location.objects.all() @@ -762,7 +762,7 @@ class RackBulkDeleteView(generic.BulkDeleteView): @register_model_view(Rack, 'contacts') -class RackContactsView(ChildContactView): +class RackContactsView(ObjectContactsView): queryset = Rack.objects.all() @@ -901,7 +901,7 @@ class ManufacturerBulkDeleteView(generic.BulkDeleteView): @register_model_view(Manufacturer, 'contacts') -class ManufacturerContactsView(ChildContactView): +class ManufacturerContactsView(ObjectContactsView): queryset = Manufacturer.objects.all() @@ -2120,7 +2120,7 @@ class DeviceBulkRenameView(generic.BulkRenameView): @register_model_view(Device, 'contacts') -class DeviceContactsView(ChildContactView): +class DeviceContactsView(ObjectContactsView): queryset = Device.objects.all() @@ -3506,7 +3506,7 @@ class PowerPanelBulkDeleteView(generic.BulkDeleteView): @register_model_view(PowerPanel, 'contacts') -class PowerPanelContactsView(ChildContactView): +class PowerPanelContactsView(ObjectContactsView): queryset = PowerPanel.objects.all() diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py index 08d1b705a..f26d00bb9 100644 --- a/netbox/ipam/views.py +++ b/netbox/ipam/views.py @@ -9,7 +9,7 @@ from circuits.models import Provider from dcim.filtersets import InterfaceFilterSet from dcim.models import Interface, Site from netbox.views import generic -from tenancy.views import ChildContactView +from tenancy.views import ObjectContactsView from utilities.utils import count_related from utilities.views import ViewTab, register_model_view from virtualization.filtersets import VMInterfaceFilterSet @@ -1293,7 +1293,7 @@ class L2VPNBulkDeleteView(generic.BulkDeleteView): @register_model_view(L2VPN, 'contacts') -class L2VPNContactsView(ChildContactView): +class L2VPNContactsView(ObjectContactsView): queryset = L2VPN.objects.all() diff --git a/netbox/tenancy/views.py b/netbox/tenancy/views.py index d7762062a..be7c565db 100644 --- a/netbox/tenancy/views.py +++ b/netbox/tenancy/views.py @@ -184,7 +184,7 @@ class TenantBulkDeleteView(generic.BulkDeleteView): @register_model_view(Tenant, 'contacts') -class TenantContactsView(ChildContactView): +class TenantContactsView(ObjectContactsView): queryset = Tenant.objects.all() diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py index 73ef379b3..4a501e14e 100644 --- a/netbox/virtualization/views.py +++ b/netbox/virtualization/views.py @@ -12,7 +12,7 @@ from extras.views import ObjectConfigContextView from ipam.models import IPAddress from ipam.tables import InterfaceVLANTable from netbox.views import generic -from tenancy.views import ChildContactView +from tenancy.views import ObjectContactsView from utilities.utils import count_related from utilities.views import ViewTab, register_model_view from . import filtersets, forms, tables @@ -142,7 +142,7 @@ class ClusterGroupBulkDeleteView(generic.BulkDeleteView): @register_model_view(ClusterGroup, 'contacts') -class ClusterGroupContactsView(ChildContactView): +class ClusterGroupContactsView(ObjectContactsView): queryset = ClusterGroup.objects.all() @@ -319,7 +319,7 @@ class ClusterRemoveDevicesView(generic.ObjectEditView): @register_model_view(Cluster, 'contacts') -class ClusterContactsView(ChildContactView): +class ClusterContactsView(ObjectContactsView): queryset = Cluster.objects.all() @@ -402,7 +402,7 @@ class VirtualMachineBulkDeleteView(generic.BulkDeleteView): @register_model_view(VirtualMachine, 'contacts') -class VirtualMachineContactsView(ChildContactView): +class VirtualMachineContactsView(ObjectContactsView): queryset = VirtualMachine.objects.all()