From a6e2e8083c46cfa59d5641891c82958d3e96ff07 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 19 Nov 2024 16:50:06 -0500 Subject: [PATCH] Fix bulk_edit & bulk_delete URL paths --- netbox/circuits/views.py | 32 ++++++++++++++++---------------- netbox/core/views.py | 10 +++++----- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/netbox/circuits/views.py b/netbox/circuits/views.py index ed0cf2978..ec13a2fce 100644 --- a/netbox/circuits/views.py +++ b/netbox/circuits/views.py @@ -55,7 +55,7 @@ class ProviderBulkImportView(generic.BulkImportView): model_form = forms.ProviderImportForm -@register_model_view(Provider, 'bulk_edit', detail=False) +@register_model_view(Provider, 'bulk_edit', path='edit', detail=False) class ProviderBulkEditView(generic.BulkEditView): queryset = Provider.objects.annotate( count_circuits=count_related(Circuit, 'provider') @@ -65,7 +65,7 @@ class ProviderBulkEditView(generic.BulkEditView): form = forms.ProviderBulkEditForm -@register_model_view(Provider, 'bulk_delete', detail=False) +@register_model_view(Provider, 'bulk_delete', path='delete', detail=False) class ProviderBulkDeleteView(generic.BulkDeleteView): queryset = Provider.objects.annotate( count_circuits=count_related(Circuit, 'provider') @@ -122,7 +122,7 @@ class ProviderAccountBulkImportView(generic.BulkImportView): table = tables.ProviderAccountTable -@register_model_view(ProviderAccount, 'bulk_edit', detail=False) +@register_model_view(ProviderAccount, 'bulk_edit', path='edit', detail=False) class ProviderAccountBulkEditView(generic.BulkEditView): queryset = ProviderAccount.objects.annotate( count_circuits=count_related(Circuit, 'provider_account') @@ -132,7 +132,7 @@ class ProviderAccountBulkEditView(generic.BulkEditView): form = forms.ProviderAccountBulkEditForm -@register_model_view(ProviderAccount, 'bulk_delete', detail=False) +@register_model_view(ProviderAccount, 'bulk_delete', path='delete', detail=False) class ProviderAccountBulkDeleteView(generic.BulkDeleteView): queryset = ProviderAccount.objects.annotate( count_circuits=count_related(Circuit, 'provider_account') @@ -195,7 +195,7 @@ class ProviderNetworkBulkImportView(generic.BulkImportView): model_form = forms.ProviderNetworkImportForm -@register_model_view(ProviderNetwork, 'bulk_edit', detail=False) +@register_model_view(ProviderNetwork, 'bulk_edit', path='edit', detail=False) class ProviderNetworkBulkEditView(generic.BulkEditView): queryset = ProviderNetwork.objects.all() filterset = filtersets.ProviderNetworkFilterSet @@ -203,7 +203,7 @@ class ProviderNetworkBulkEditView(generic.BulkEditView): form = forms.ProviderNetworkBulkEditForm -@register_model_view(ProviderNetwork, 'bulk_delete', detail=False) +@register_model_view(ProviderNetwork, 'bulk_delete', path='delete', detail=False) class ProviderNetworkBulkDeleteView(generic.BulkDeleteView): queryset = ProviderNetwork.objects.all() filterset = filtersets.ProviderNetworkFilterSet @@ -252,7 +252,7 @@ class CircuitTypeBulkImportView(generic.BulkImportView): model_form = forms.CircuitTypeImportForm -@register_model_view(CircuitType, 'bulk_edit', detail=False) +@register_model_view(CircuitType, 'bulk_edit', path='edit', detail=False) class CircuitTypeBulkEditView(generic.BulkEditView): queryset = CircuitType.objects.annotate( circuit_count=count_related(Circuit, 'type') @@ -262,7 +262,7 @@ class CircuitTypeBulkEditView(generic.BulkEditView): form = forms.CircuitTypeBulkEditForm -@register_model_view(CircuitType, 'bulk_delete', detail=False) +@register_model_view(CircuitType, 'bulk_delete', path='delete', detail=False) class CircuitTypeBulkDeleteView(generic.BulkDeleteView): queryset = CircuitType.objects.annotate( circuit_count=count_related(Circuit, 'type') @@ -318,7 +318,7 @@ class CircuitBulkImportView(generic.BulkImportView): return data -@register_model_view(Circuit, 'bulk_edit', detail=False) +@register_model_view(Circuit, 'bulk_edit', path='edit', detail=False) class CircuitBulkEditView(generic.BulkEditView): queryset = Circuit.objects.prefetch_related( 'tenant__group', 'termination_a__termination', 'termination_z__termination', @@ -328,7 +328,7 @@ class CircuitBulkEditView(generic.BulkEditView): form = forms.CircuitBulkEditForm -@register_model_view(Circuit, 'bulk_delete', detail=False) +@register_model_view(Circuit, 'bulk_delete', path='delete', detail=False) class CircuitBulkDeleteView(generic.BulkDeleteView): queryset = Circuit.objects.prefetch_related( 'tenant__group', 'termination_a__termination', 'termination_z__termination', @@ -453,7 +453,7 @@ class CircuitTerminationBulkImportView(generic.BulkImportView): model_form = forms.CircuitTerminationImportForm -@register_model_view(CircuitTermination, 'bulk_edit', detail=False) +@register_model_view(CircuitTermination, 'bulk_edit', path='edit', detail=False) class CircuitTerminationBulkEditView(generic.BulkEditView): queryset = CircuitTermination.objects.all() filterset = filtersets.CircuitTerminationFilterSet @@ -461,7 +461,7 @@ class CircuitTerminationBulkEditView(generic.BulkEditView): form = forms.CircuitTerminationBulkEditForm -@register_model_view(CircuitTermination, 'bulk_delete', detail=False) +@register_model_view(CircuitTermination, 'bulk_delete', path='delete', detail=False) class CircuitTerminationBulkDeleteView(generic.BulkDeleteView): queryset = CircuitTermination.objects.all() filterset = filtersets.CircuitTerminationFilterSet @@ -514,7 +514,7 @@ class CircuitGroupBulkImportView(generic.BulkImportView): model_form = forms.CircuitGroupImportForm -@register_model_view(CircuitGroup, 'bulk_edit', detail=False) +@register_model_view(CircuitGroup, 'bulk_edit', path='edit', detail=False) class CircuitGroupBulkEditView(generic.BulkEditView): queryset = CircuitGroup.objects.all() filterset = filtersets.CircuitGroupFilterSet @@ -522,7 +522,7 @@ class CircuitGroupBulkEditView(generic.BulkEditView): form = forms.CircuitGroupBulkEditForm -@register_model_view(CircuitGroup, 'bulk_delete', detail=False) +@register_model_view(CircuitGroup, 'bulk_delete', path='delete', detail=False) class CircuitGroupBulkDeleteView(generic.BulkDeleteView): queryset = CircuitGroup.objects.all() filterset = filtersets.CircuitGroupFilterSet @@ -564,7 +564,7 @@ class CircuitGroupAssignmentBulkImportView(generic.BulkImportView): model_form = forms.CircuitGroupAssignmentImportForm -@register_model_view(CircuitGroupAssignment, 'bulk_edit', detail=False) +@register_model_view(CircuitGroupAssignment, 'bulk_edit', path='edit', detail=False) class CircuitGroupAssignmentBulkEditView(generic.BulkEditView): queryset = CircuitGroupAssignment.objects.all() filterset = filtersets.CircuitGroupAssignmentFilterSet @@ -572,7 +572,7 @@ class CircuitGroupAssignmentBulkEditView(generic.BulkEditView): form = forms.CircuitGroupAssignmentBulkEditForm -@register_model_view(CircuitGroupAssignment, 'bulk_delete', detail=False) +@register_model_view(CircuitGroupAssignment, 'bulk_delete', path='delete', detail=False) class CircuitGroupAssignmentBulkDeleteView(generic.BulkDeleteView): queryset = CircuitGroupAssignment.objects.all() filterset = filtersets.CircuitGroupAssignmentFilterSet diff --git a/netbox/core/views.py b/netbox/core/views.py index 125667fd0..96e57f97f 100644 --- a/netbox/core/views.py +++ b/netbox/core/views.py @@ -111,7 +111,7 @@ class DataSourceBulkImportView(generic.BulkImportView): model_form = forms.DataSourceImportForm -@register_model_view(DataSource, 'bulk_edit', detail=False) +@register_model_view(DataSource, 'bulk_edit', path='edit', detail=False) class DataSourceBulkEditView(generic.BulkEditView): queryset = DataSource.objects.annotate( count_files=count_related(DataFile, 'source') @@ -121,7 +121,7 @@ class DataSourceBulkEditView(generic.BulkEditView): form = forms.DataSourceBulkEditForm -@register_model_view(DataSource, 'bulk_delete', detail=False) +@register_model_view(DataSource, 'bulk_delete', path='delete', detail=False) class DataSourceBulkDeleteView(generic.BulkDeleteView): queryset = DataSource.objects.annotate( count_files=count_related(DataFile, 'source') @@ -155,7 +155,7 @@ class DataFileDeleteView(generic.ObjectDeleteView): queryset = DataFile.objects.all() -@register_model_view(DataFile, 'bulk_delete', detail=False) +@register_model_view(DataFile, 'bulk_delete', path='delete', detail=False) class DataFileBulkDeleteView(generic.BulkDeleteView): queryset = DataFile.objects.defer('data') filterset = filtersets.DataFileFilterSet @@ -188,7 +188,7 @@ class JobDeleteView(generic.ObjectDeleteView): queryset = Job.objects.all() -@register_model_view(Job, 'bulk_delete', detail=False) +@register_model_view(Job, 'bulk_delete', path='delete', detail=False) class JobBulkDeleteView(generic.BulkDeleteView): queryset = Job.objects.all() filterset = filtersets.JobFilterSet @@ -293,7 +293,7 @@ class ConfigRevisionDeleteView(generic.ObjectDeleteView): queryset = ConfigRevision.objects.all() -@register_model_view(ConfigRevision, 'bulk_delete', detail=False) +@register_model_view(ConfigRevision, 'bulk_delete', path='delete', detail=False) class ConfigRevisionBulkDeleteView(generic.BulkDeleteView): queryset = ConfigRevision.objects.all() filterset = filtersets.ConfigRevisionFilterSet