Skip to content

Commit 37cfc50

Browse files
jeremystretchjeremystretch
authored
Fixes #19322: Correct URL paths for bulk import views (#19323)
1 parent e8dd486 commit 37cfc50

File tree

10 files changed

+98
-98
lines changed

10 files changed

+98
-98
lines changed

‎netbox/circuits/views.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class ProviderDeleteView(generic.ObjectDeleteView):
5252
queryset = Provider.objects.all()
5353

5454

55-
@register_model_view(Provider, 'bulk_import', detail=False)
55+
@register_model_view(Provider, 'bulk_import', path='import', detail=False)
5656
class ProviderBulkImportView(generic.BulkImportView):
5757
queryset = Provider.objects.all()
5858
model_form = forms.ProviderImportForm
@@ -118,7 +118,7 @@ class ProviderAccountDeleteView(generic.ObjectDeleteView):
118118
queryset = ProviderAccount.objects.all()
119119

120120

121-
@register_model_view(ProviderAccount, 'bulk_import', detail=False)
121+
@register_model_view(ProviderAccount, 'bulk_import', path='import', detail=False)
122122
class ProviderAccountBulkImportView(generic.BulkImportView):
123123
queryset = ProviderAccount.objects.all()
124124
model_form = forms.ProviderAccountImportForm
@@ -197,7 +197,7 @@ class ProviderNetworkDeleteView(generic.ObjectDeleteView):
197197
queryset = ProviderNetwork.objects.all()
198198

199199

200-
@register_model_view(ProviderNetwork, 'bulk_import', detail=False)
200+
@register_model_view(ProviderNetwork, 'bulk_import', path='import', detail=False)
201201
class ProviderNetworkBulkImportView(generic.BulkImportView):
202202
queryset = ProviderNetwork.objects.all()
203203
model_form = forms.ProviderNetworkImportForm
@@ -254,7 +254,7 @@ class CircuitTypeDeleteView(generic.ObjectDeleteView):
254254
queryset = CircuitType.objects.all()
255255

256256

257-
@register_model_view(CircuitType, 'bulk_import', detail=False)
257+
@register_model_view(CircuitType, 'bulk_import', path='import', detail=False)
258258
class CircuitTypeBulkImportView(generic.BulkImportView):
259259
queryset = CircuitType.objects.all()
260260
model_form = forms.CircuitTypeImportForm
@@ -310,7 +310,7 @@ class CircuitDeleteView(generic.ObjectDeleteView):
310310
queryset = Circuit.objects.all()
311311

312312

313-
@register_model_view(Circuit, 'bulk_import', detail=False)
313+
@register_model_view(Circuit, 'bulk_import', path='import', detail=False)
314314
class CircuitBulkImportView(generic.BulkImportView):
315315
queryset = Circuit.objects.all()
316316
model_form = forms.CircuitImportForm
@@ -455,7 +455,7 @@ class CircuitTerminationDeleteView(generic.ObjectDeleteView):
455455
queryset = CircuitTermination.objects.all()
456456

457457

458-
@register_model_view(CircuitTermination, 'bulk_import', detail=False)
458+
@register_model_view(CircuitTermination, 'bulk_import', path='import', detail=False)
459459
class CircuitTerminationBulkImportView(generic.BulkImportView):
460460
queryset = CircuitTermination.objects.all()
461461
model_form = forms.CircuitTerminationImportForm
@@ -516,7 +516,7 @@ class CircuitGroupDeleteView(generic.ObjectDeleteView):
516516
queryset = CircuitGroup.objects.all()
517517

518518

519-
@register_model_view(CircuitGroup, 'bulk_import', detail=False)
519+
@register_model_view(CircuitGroup, 'bulk_import', path='import', detail=False)
520520
class CircuitGroupBulkImportView(generic.BulkImportView):
521521
queryset = CircuitGroup.objects.all()
522522
model_form = forms.CircuitGroupImportForm
@@ -566,7 +566,7 @@ class CircuitGroupAssignmentDeleteView(generic.ObjectDeleteView):
566566
queryset = CircuitGroupAssignment.objects.all()
567567

568568

569-
@register_model_view(CircuitGroupAssignment, 'bulk_import', detail=False)
569+
@register_model_view(CircuitGroupAssignment, 'bulk_import', path='import', detail=False)
570570
class CircuitGroupAssignmentBulkImportView(generic.BulkImportView):
571571
queryset = CircuitGroupAssignment.objects.all()
572572
model_form = forms.CircuitGroupAssignmentImportForm
@@ -623,7 +623,7 @@ class VirtualCircuitTypeDeleteView(generic.ObjectDeleteView):
623623
queryset = VirtualCircuitType.objects.all()
624624

625625

626-
@register_model_view(VirtualCircuitType, 'bulk_import', detail=False)
626+
@register_model_view(VirtualCircuitType, 'bulk_import', path='import', detail=False)
627627
class VirtualCircuitTypeBulkImportView(generic.BulkImportView):
628628
queryset = VirtualCircuitType.objects.all()
629629
model_form = forms.VirtualCircuitTypeImportForm

‎netbox/core/views.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ class DataSourceDeleteView(generic.ObjectDeleteView):
102102
queryset = DataSource.objects.all()
103103

104104

105-
@register_model_view(DataSource, 'bulk_import', detail=False)
105+
@register_model_view(DataSource, 'bulk_import', path='import', detail=False)
106106
class DataSourceBulkImportView(generic.BulkImportView):
107107
queryset = DataSource.objects.all()
108108
model_form = forms.DataSourceImportForm

‎netbox/dcim/views.py‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ class RegionDeleteView(generic.ObjectDeleteView):
280280
queryset = Region.objects.all()
281281

282282

283-
@register_model_view(Region, 'bulk_import', detail=False)
283+
@register_model_view(Region, 'bulk_import', path='import', detail=False)
284284
class RegionBulkImportView(generic.BulkImportView):
285285
queryset = Region.objects.all()
286286
model_form = forms.RegionImportForm
@@ -411,7 +411,7 @@ class SiteGroupDeleteView(generic.ObjectDeleteView):
411411
queryset = SiteGroup.objects.all()
412412

413413

414-
@register_model_view(SiteGroup, 'bulk_import', detail=False)
414+
@register_model_view(SiteGroup, 'bulk_import', path='import', detail=False)
415415
class SiteGroupBulkImportView(generic.BulkImportView):
416416
queryset = SiteGroup.objects.all()
417417
model_form = forms.SiteGroupImportForm
@@ -507,7 +507,7 @@ class SiteDeleteView(generic.ObjectDeleteView):
507507
queryset = Site.objects.all()
508508

509509

510-
@register_model_view(Site, 'bulk_import', detail=False)
510+
@register_model_view(Site, 'bulk_import', path='import', detail=False)
511511
class SiteBulkImportView(generic.BulkImportView):
512512
queryset = Site.objects.all()
513513
model_form = forms.SiteImportForm
@@ -610,7 +610,7 @@ class LocationDeleteView(generic.ObjectDeleteView):
610610
queryset = Location.objects.all()
611611

612612

613-
@register_model_view(Location, 'bulk_import', detail=False)
613+
@register_model_view(Location, 'bulk_import', path='import', detail=False)
614614
class LocationBulkImportView(generic.BulkImportView):
615615
queryset = Location.objects.all()
616616
model_form = forms.LocationImportForm
@@ -684,7 +684,7 @@ class RackRoleDeleteView(generic.ObjectDeleteView):
684684
queryset = RackRole.objects.all()
685685

686686

687-
@register_model_view(RackRole, 'bulk_import', detail=False)
687+
@register_model_view(RackRole, 'bulk_import', path='import', detail=False)
688688
class RackRoleBulkImportView(generic.BulkImportView):
689689
queryset = RackRole.objects.all()
690690
model_form = forms.RackRoleImportForm
@@ -745,7 +745,7 @@ class RackTypeDeleteView(generic.ObjectDeleteView):
745745
queryset = RackType.objects.all()
746746

747747

748-
@register_model_view(RackType, 'bulk_import', detail=False)
748+
@register_model_view(RackType, 'bulk_import', path='import', detail=False)
749749
class RackTypeBulkImportView(generic.BulkImportView):
750750
queryset = RackType.objects.all()
751751
model_form = forms.RackTypeImportForm
@@ -924,7 +924,7 @@ class RackDeleteView(generic.ObjectDeleteView):
924924
queryset = Rack.objects.all()
925925

926926

927-
@register_model_view(Rack, 'bulk_import', detail=False)
927+
@register_model_view(Rack, 'bulk_import', path='import', detail=False)
928928
class RackBulkImportView(generic.BulkImportView):
929929
queryset = Rack.objects.all()
930930
model_form = forms.RackImportForm
@@ -986,7 +986,7 @@ class RackReservationDeleteView(generic.ObjectDeleteView):
986986
queryset = RackReservation.objects.all()
987987

988988

989-
@register_model_view(RackReservation, 'bulk_import', detail=False)
989+
@register_model_view(RackReservation, 'bulk_import', path='import', detail=False)
990990
class RackReservationImportView(generic.BulkImportView):
991991
queryset = RackReservation.objects.all()
992992
model_form = forms.RackReservationImportForm
@@ -1057,7 +1057,7 @@ class ManufacturerDeleteView(generic.ObjectDeleteView):
10571057
queryset = Manufacturer.objects.all()
10581058

10591059

1060-
@register_model_view(Manufacturer, 'bulk_import', detail=False)
1060+
@register_model_view(Manufacturer, 'bulk_import', path='import', detail=False)
10611061
class ManufacturerBulkImportView(generic.BulkImportView):
10621062
queryset = Manufacturer.objects.all()
10631063
model_form = forms.ManufacturerImportForm
@@ -1283,7 +1283,7 @@ class DeviceTypeInventoryItemsView(DeviceTypeComponentsView):
12831283
)
12841284

12851285

1286-
@register_model_view(DeviceType, 'bulk_import', detail=False)
1286+
@register_model_view(DeviceType, 'bulk_import', path='import', detail=False)
12871287
class DeviceTypeImportView(generic.BulkImportView):
12881288
additional_permissions = [
12891289
'dcim.add_devicetype',
@@ -1497,7 +1497,7 @@ class ModuleTypeModuleBaysView(ModuleTypeComponentsView):
14971497
)
14981498

14991499

1500-
@register_model_view(ModuleType, 'bulk_import', detail=False)
1500+
@register_model_view(ModuleType, 'bulk_import', path='import', detail=False)
15011501
class ModuleTypeImportView(generic.BulkImportView):
15021502
additional_permissions = [
15031503
'dcim.add_moduletype',
@@ -1995,7 +1995,7 @@ class DeviceRoleDeleteView(generic.ObjectDeleteView):
19951995
queryset = DeviceRole.objects.all()
19961996

19971997

1998-
@register_model_view(DeviceRole, 'bulk_import', detail=False)
1998+
@register_model_view(DeviceRole, 'bulk_import', path='import', detail=False)
19991999
class DeviceRoleBulkImportView(generic.BulkImportView):
20002000
queryset = DeviceRole.objects.all()
20012001
model_form = forms.DeviceRoleImportForm
@@ -2059,7 +2059,7 @@ class PlatformDeleteView(generic.ObjectDeleteView):
20592059
queryset = Platform.objects.all()
20602060

20612061

2062-
@register_model_view(Platform, 'bulk_import', detail=False)
2062+
@register_model_view(Platform, 'bulk_import', path='import', detail=False)
20632063
class PlatformBulkImportView(generic.BulkImportView):
20642064
queryset = Platform.objects.all()
20652065
model_form = forms.PlatformImportForm
@@ -2342,7 +2342,7 @@ def get_children(self, request, parent):
23422342
return self.child_model.objects.restrict(request.user, 'view').filter(cluster=parent.cluster, device=parent)
23432343

23442344

2345-
@register_model_view(Device, 'bulk_import', detail=False)
2345+
@register_model_view(Device, 'bulk_import', path='import', detail=False)
23462346
class DeviceBulkImportView(generic.BulkImportView):
23472347
queryset = Device.objects.all()
23482348
model_form = forms.DeviceImportForm
@@ -2420,7 +2420,7 @@ class ModuleDeleteView(generic.ObjectDeleteView):
24202420
queryset = Module.objects.all()
24212421

24222422

2423-
@register_model_view(Module, 'bulk_import', detail=False)
2423+
@register_model_view(Module, 'bulk_import', path='import', detail=False)
24242424
class ModuleBulkImportView(generic.BulkImportView):
24252425
queryset = Module.objects.all()
24262426
model_form = forms.ModuleImportForm
@@ -2481,7 +2481,7 @@ class ConsolePortDeleteView(generic.ObjectDeleteView):
24812481
queryset = ConsolePort.objects.all()
24822482

24832483

2484-
@register_model_view(ConsolePort, 'bulk_import', detail=False)
2484+
@register_model_view(ConsolePort, 'bulk_import', path='import', detail=False)
24852485
class ConsolePortBulkImportView(generic.BulkImportView):
24862486
queryset = ConsolePort.objects.all()
24872487
model_form = forms.ConsolePortImportForm
@@ -2556,7 +2556,7 @@ class ConsoleServerPortDeleteView(generic.ObjectDeleteView):
25562556
queryset = ConsoleServerPort.objects.all()
25572557

25582558

2559-
@register_model_view(ConsoleServerPort, 'bulk_import', detail=False)
2559+
@register_model_view(ConsoleServerPort, 'bulk_import', path='import', detail=False)
25602560
class ConsoleServerPortBulkImportView(generic.BulkImportView):
25612561
queryset = ConsoleServerPort.objects.all()
25622562
model_form = forms.ConsoleServerPortImportForm
@@ -2631,7 +2631,7 @@ class PowerPortDeleteView(generic.ObjectDeleteView):
26312631
queryset = PowerPort.objects.all()
26322632

26332633

2634-
@register_model_view(PowerPort, 'bulk_import', detail=False)
2634+
@register_model_view(PowerPort, 'bulk_import', path='import', detail=False)
26352635
class PowerPortBulkImportView(generic.BulkImportView):
26362636
queryset = PowerPort.objects.all()
26372637
model_form = forms.PowerPortImportForm
@@ -2706,7 +2706,7 @@ class PowerOutletDeleteView(generic.ObjectDeleteView):
27062706
queryset = PowerOutlet.objects.all()
27072707

27082708

2709-
@register_model_view(PowerOutlet, 'bulk_import', detail=False)
2709+
@register_model_view(PowerOutlet, 'bulk_import', path='import', detail=False)
27102710
class PowerOutletBulkImportView(generic.BulkImportView):
27112711
queryset = PowerOutlet.objects.all()
27122712
model_form = forms.PowerOutletImportForm
@@ -2838,7 +2838,7 @@ class InterfaceDeleteView(generic.ObjectDeleteView):
28382838
queryset = Interface.objects.all()
28392839

28402840

2841-
@register_model_view(Interface, 'bulk_import', detail=False)
2841+
@register_model_view(Interface, 'bulk_import', path='import', detail=False)
28422842
class InterfaceBulkImportView(generic.BulkImportView):
28432843
queryset = Interface.objects.all()
28442844
model_form = forms.InterfaceImportForm
@@ -2924,7 +2924,7 @@ class FrontPortDeleteView(generic.ObjectDeleteView):
29242924
queryset = FrontPort.objects.all()
29252925

29262926

2927-
@register_model_view(FrontPort, 'bulk_import', detail=False)
2927+
@register_model_view(FrontPort, 'bulk_import', path='import', detail=False)
29282928
class FrontPortBulkImportView(generic.BulkImportView):
29292929
queryset = FrontPort.objects.all()
29302930
model_form = forms.FrontPortImportForm
@@ -2999,7 +2999,7 @@ class RearPortDeleteView(generic.ObjectDeleteView):
29992999
queryset = RearPort.objects.all()
30003000

30013001

3002-
@register_model_view(RearPort, 'bulk_import', detail=False)
3002+
@register_model_view(RearPort, 'bulk_import', path='import', detail=False)
30033003
class RearPortBulkImportView(generic.BulkImportView):
30043004
queryset = RearPort.objects.all()
30053005
model_form = forms.RearPortImportForm
@@ -3074,7 +3074,7 @@ class ModuleBayDeleteView(generic.ObjectDeleteView):
30743074
queryset = ModuleBay.objects.all()
30753075

30763076

3077-
@register_model_view(ModuleBay, 'bulk_import', detail=False)
3077+
@register_model_view(ModuleBay, 'bulk_import', path='import', detail=False)
30783078
class ModuleBayBulkImportView(generic.BulkImportView):
30793079
queryset = ModuleBay.objects.all()
30803080
model_form = forms.ModuleBayImportForm
@@ -3221,7 +3221,7 @@ def post(self, request, pk):
32213221
})
32223222

32233223

3224-
@register_model_view(DeviceBay, 'bulk_import', detail=False)
3224+
@register_model_view(DeviceBay, 'bulk_import', path='import', detail=False)
32253225
class DeviceBayBulkImportView(generic.BulkImportView):
32263226
queryset = DeviceBay.objects.all()
32273227
model_form = forms.DeviceBayImportForm
@@ -3287,7 +3287,7 @@ class InventoryItemDeleteView(generic.ObjectDeleteView):
32873287
queryset = InventoryItem.objects.all()
32883288

32893289

3290-
@register_model_view(InventoryItem, 'bulk_import', detail=False)
3290+
@register_model_view(InventoryItem, 'bulk_import', path='import', detail=False)
32913291
class InventoryItemBulkImportView(generic.BulkImportView):
32923292
queryset = InventoryItem.objects.all()
32933293
model_form = forms.InventoryItemImportForm
@@ -3368,7 +3368,7 @@ class InventoryItemRoleDeleteView(generic.ObjectDeleteView):
33683368
queryset = InventoryItemRole.objects.all()
33693369

33703370

3371-
@register_model_view(InventoryItemRole, 'bulk_import', detail=False)
3371+
@register_model_view(InventoryItemRole, 'bulk_import', path='import', detail=False)
33723372
class InventoryItemRoleBulkImportView(generic.BulkImportView):
33733373
queryset = InventoryItemRole.objects.all()
33743374
model_form = forms.InventoryItemRoleImportForm
@@ -3564,7 +3564,7 @@ class CableDeleteView(generic.ObjectDeleteView):
35643564
queryset = Cable.objects.all()
35653565

35663566

3567-
@register_model_view(Cable, 'bulk_import', detail=False)
3567+
@register_model_view(Cable, 'bulk_import', path='import', detail=False)
35683568
class CableBulkImportView(generic.BulkImportView):
35693569
queryset = Cable.objects.all()
35703570
model_form = forms.CableImportForm
@@ -3865,7 +3865,7 @@ def post(self, request, pk):
38653865
})
38663866

38673867

3868-
@register_model_view(VirtualChassis, 'bulk_import', detail=False)
3868+
@register_model_view(VirtualChassis, 'bulk_import', path='import', detail=False)
38693869
class VirtualChassisBulkImportView(generic.BulkImportView):
38703870
queryset = VirtualChassis.objects.all()
38713871
model_form = forms.VirtualChassisImportForm
@@ -3922,7 +3922,7 @@ class PowerPanelDeleteView(generic.ObjectDeleteView):
39223922
queryset = PowerPanel.objects.all()
39233923

39243924

3925-
@register_model_view(PowerPanel, 'bulk_import', detail=False)
3925+
@register_model_view(PowerPanel, 'bulk_import', path='import', detail=False)
39263926
class PowerPanelBulkImportView(generic.BulkImportView):
39273927
queryset = PowerPanel.objects.all()
39283928
model_form = forms.PowerPanelImportForm
@@ -3979,7 +3979,7 @@ class PowerFeedDeleteView(generic.ObjectDeleteView):
39793979
queryset = PowerFeed.objects.all()
39803980

39813981

3982-
@register_model_view(PowerFeed, 'bulk_import', detail=False)
3982+
@register_model_view(PowerFeed, 'bulk_import', path='import', detail=False)
39833983
class PowerFeedBulkImportView(generic.BulkImportView):
39843984
queryset = PowerFeed.objects.all()
39853985
model_form = forms.PowerFeedImportForm
@@ -4051,7 +4051,7 @@ class VirtualDeviceContextDeleteView(generic.ObjectDeleteView):
40514051
queryset = VirtualDeviceContext.objects.all()
40524052

40534053

4054-
@register_model_view(VirtualDeviceContext, 'bulk_import', detail=False)
4054+
@register_model_view(VirtualDeviceContext, 'bulk_import', path='import', detail=False)
40554055
class VirtualDeviceContextBulkImportView(generic.BulkImportView):
40564056
queryset = VirtualDeviceContext.objects.all()
40574057
model_form = forms.VirtualDeviceContextImportForm
@@ -4101,7 +4101,7 @@ class MACAddressDeleteView(generic.ObjectDeleteView):
41014101
queryset = MACAddress.objects.all()
41024102

41034103

4104-
@register_model_view(MACAddress, 'bulk_import', detail=False)
4104+
@register_model_view(MACAddress, 'bulk_import', path='import', detail=False)
41054105
class MACAddressBulkImportView(generic.BulkImportView):
41064106
queryset = MACAddress.objects.all()
41074107
model_form = forms.MACAddressImportForm

0 commit comments

Comments
 (0)