Главная Обзор Помощь
Вход
LBP
/
netbox
зеркало из https://github.com/netbox-community/netbox.git
2
0
Ответвить 0
Файлы Задачи 0 Вики
Просмотр исходного кода

Add queryset to all BulkImportViews

Jeremy Stretch 5 лет назад
Родитель
5486cff441
Сommit
40c590f445
7 измененных файлов с 52 добавлено и 10 удалено
Разделённый вид Показать статистику Diff
  1. 3 0
      netbox/circuits/views.py
  2. 23 0
      netbox/dcim/views.py
  3. 8 0
      netbox/ipam/views.py
  4. 2 0
      netbox/secrets/views.py
  5. 2 0
      netbox/tenancy/views.py
  6. 10 10
      netbox/utilities/views.py
  7. 4 0
      netbox/virtualization/views.py

+ 3 - 0
netbox/circuits/views.py
Просмотреть файл 

@@ -80,6 +80,7 @@ class ProviderDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 
 class ProviderBulkImportView(PermissionRequiredMixin, BulkImportView):
 
     permission_required = 'circuits.add_provider'
 
+    queryset = Provider.objects.all()
 
     model_form = forms.ProviderCSVForm
 
     table = tables.ProviderTable
 
     default_return_url = 'circuits:provider_list'
 
@@ -125,6 +126,7 @@ class CircuitTypeEditView(CircuitTypeCreateView):
 
 
 class CircuitTypeBulkImportView(PermissionRequiredMixin, BulkImportView):
 
     permission_required = 'circuits.add_circuittype'
 
+    queryset = CircuitType.objects.all()
 
     model_form = forms.CircuitTypeCSVForm
 
     table = tables.CircuitTypeTable
 
     default_return_url = 'circuits:circuittype_list'
 
@@ -196,6 +198,7 @@ class CircuitDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 
 class CircuitBulkImportView(PermissionRequiredMixin, BulkImportView):
 
     permission_required = 'circuits.add_circuit'
 
+    queryset = Circuit.objects.all()
 
     model_form = forms.CircuitCSVForm
 
     table = tables.CircuitTable
 
     default_return_url = 'circuits:circuit_list'

+ 23 - 0
netbox/dcim/views.py
Просмотреть файл 

@@ -169,6 +169,7 @@ class RegionEditView(RegionCreateView):
 
 
 class RegionBulkImportView(PermissionRequiredMixin, BulkImportView):
 
     permission_required = 'dcim.add_region'
 
+    queryset = Region.objects.all()
 
     model_form = forms.RegionCSVForm
 
     table = tables.RegionTable
 
     default_return_url = 'dcim:region_list'
 
@@ -240,6 +241,7 @@ class SiteDeleteView(ObjectPermissionRequiredMixin, ObjectDeleteView):
 
 
 class SiteBulkImportView(PermissionRequiredMixin, BulkImportView):
 
     permission_required = 'dcim.add_site'
 
+    queryset = Site.objects.all()
 
     model_form = forms.SiteCSVForm
 
     table = tables.SiteTable
 
     default_return_url = 'dcim:site_list'
 
@@ -293,6 +295,7 @@ class RackGroupEditView(RackGroupCreateView):
 
 
 class RackGroupBulkImportView(PermissionRequiredMixin, BulkImportView):
 
     permission_required = 'dcim.add_rackgroup'
 
+    queryset = RackGroup.objects.all()
 
     model_form = forms.RackGroupCSVForm
 
     table = tables.RackGroupTable
 
     default_return_url = 'dcim:rackgroup_list'
 
@@ -329,6 +332,7 @@ class RackRoleEditView(RackRoleCreateView):
 
 
 class RackRoleBulkImportView(PermissionRequiredMixin, BulkImportView):
 
     permission_required = 'dcim.add_rackrole'
 
+    queryset = RackRole.objects.all()
 
     model_form = forms.RackRoleCSVForm
 
     table = tables.RackRoleTable
 
     default_return_url = 'dcim:rackrole_list'
 
@@ -446,6 +450,7 @@ class RackDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 
 class RackBulkImportView(PermissionRequiredMixin, BulkImportView):
 
     permission_required = 'dcim.add_rack'
 
+    queryset = Rack.objects.all()
 
     model_form = forms.RackCSVForm
 
     table = tables.RackTable
 
     default_return_url = 'dcim:rack_list'
 
@@ -520,6 +525,7 @@ class RackReservationDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 
 class RackReservationImportView(PermissionRequiredMixin, BulkImportView):
 
     permission_required = 'dcim.add_rackreservation'
 
+    queryset = RackReservation.objects.all()
 
     model_form = forms.RackReservationCSVForm
 
     table = tables.RackReservationTable
 
     default_return_url = 'dcim:rackreservation_list'
 
@@ -579,6 +585,7 @@ class ManufacturerEditView(ManufacturerCreateView):
 
 
 class ManufacturerBulkImportView(PermissionRequiredMixin, BulkImportView):
 
     permission_required = 'dcim.add_manufacturer'
 
+    queryset = Manufacturer.objects.all()
 
     model_form = forms.ManufacturerCSVForm
 
     table = tables.ManufacturerTable
 
     default_return_url = 'dcim:manufacturer_list'
 
@@ -1039,6 +1046,7 @@ class DeviceRoleEditView(DeviceRoleCreateView):
 
 
 class DeviceRoleBulkImportView(PermissionRequiredMixin, BulkImportView):
 
     permission_required = 'dcim.add_devicerole'
 
+    queryset = DeviceRole.objects.all()
 
     model_form = forms.DeviceRoleCSVForm
 
     table = tables.DeviceRoleTable
 
     default_return_url = 'dcim:devicerole_list'
 
@@ -1074,6 +1082,7 @@ class PlatformEditView(PlatformCreateView):
 
 
 class PlatformBulkImportView(PermissionRequiredMixin, BulkImportView):
 
     permission_required = 'dcim.add_platform'
 
+    queryset = Platform.objects.all()
 
     model_form = forms.PlatformCSVForm
 
     table = tables.PlatformTable
 
     default_return_url = 'dcim:platform_list'
 
@@ -1267,6 +1276,7 @@ class DeviceDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 
 class DeviceBulkImportView(PermissionRequiredMixin, BulkImportView):
 
     permission_required = 'dcim.add_device'
 
+    queryset = Device.objects.all()
 
     model_form = forms.DeviceCSVForm
 
     table = tables.DeviceImportTable
 
     template_name = 'dcim/device_import.html'
 
@@ -1275,6 +1285,7 @@ class DeviceBulkImportView(PermissionRequiredMixin, BulkImportView):
 
 
 class ChildDeviceBulkImportView(PermissionRequiredMixin, BulkImportView):
 
     permission_required = 'dcim.add_device'
 
+    queryset = Device.objects.all()
 
     model_form = forms.ChildDeviceCSVForm
 
     table = tables.DeviceImportTable
 
     template_name = 'dcim/device_import_child.html'
 
@@ -1343,6 +1354,7 @@ class ConsolePortDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 
 class ConsolePortBulkImportView(PermissionRequiredMixin, BulkImportView):
 
     permission_required = 'dcim.add_consoleport'
 
+    queryset = ConsolePort.objects.all()
 
     model_form = forms.ConsolePortCSVForm
 
     table = tables.ConsolePortImportTable
 
     default_return_url = 'dcim:consoleport_list'
 
@@ -1398,6 +1410,7 @@ class ConsoleServerPortDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 
 class ConsoleServerPortBulkImportView(PermissionRequiredMixin, BulkImportView):
 
     permission_required = 'dcim.add_consoleserverport'
 
+    queryset = ConsoleServerPort.objects.all()
 
     model_form = forms.ConsoleServerPortCSVForm
 
     table = tables.ConsoleServerPortImportTable
 
     default_return_url = 'dcim:consoleserverport_list'
 
@@ -1465,6 +1478,7 @@ class PowerPortDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 
 class PowerPortBulkImportView(PermissionRequiredMixin, BulkImportView):
 
     permission_required = 'dcim.add_powerport'
 
+    queryset = PowerPort.objects.all()
 
     model_form = forms.PowerPortCSVForm
 
     table = tables.PowerPortImportTable
 
     default_return_url = 'dcim:powerport_list'
 
@@ -1520,6 +1534,7 @@ class PowerOutletDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 
 class PowerOutletBulkImportView(PermissionRequiredMixin, BulkImportView):
 
     permission_required = 'dcim.add_poweroutlet'
 
+    queryset = PowerOutlet.objects.all()
 
     model_form = forms.PowerOutletCSVForm
 
     table = tables.PowerOutletImportTable
 
     default_return_url = 'dcim:poweroutlet_list'
 
@@ -1624,6 +1639,7 @@ class InterfaceDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 
 class InterfaceBulkImportView(PermissionRequiredMixin, BulkImportView):
 
     permission_required = 'dcim.add_interface'
 
+    queryset = Interface.objects.all()
 
     model_form = forms.InterfaceCSVForm
 
     table = tables.InterfaceImportTable
 
     default_return_url = 'dcim:interface_list'
 
@@ -1691,6 +1707,7 @@ class FrontPortDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 
 class FrontPortBulkImportView(PermissionRequiredMixin, BulkImportView):
 
     permission_required = 'dcim.add_frontport'
 
+    queryset = FrontPort.objects.all()
 
     model_form = forms.FrontPortCSVForm
 
     table = tables.FrontPortImportTable
 
     default_return_url = 'dcim:frontport_list'
 
@@ -1758,6 +1775,7 @@ class RearPortDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 
 class RearPortBulkImportView(PermissionRequiredMixin, BulkImportView):
 
     permission_required = 'dcim.add_rearport'
 
+    queryset = RearPort.objects.all()
 
     model_form = forms.RearPortCSVForm
 
     table = tables.RearPortImportTable
 
     default_return_url = 'dcim:rearport_list'
 
@@ -1896,6 +1914,7 @@ class DeviceBayDepopulateView(PermissionRequiredMixin, View):
 
 
 class DeviceBayBulkImportView(PermissionRequiredMixin, BulkImportView):
 
     permission_required = 'dcim.add_devicebay'
 
+    queryset = DeviceBay.objects.all()
 
     model_form = forms.DeviceBayCSVForm
 
     table = tables.DeviceBayImportTable
 
     default_return_url = 'dcim:devicebay_list'
 
@@ -2170,6 +2189,7 @@ class CableDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 
 class CableBulkImportView(PermissionRequiredMixin, BulkImportView):
 
     permission_required = 'dcim.add_cable'
 
+    queryset = Cable.objects.all()
 
     model_form = forms.CableCSVForm
 
     table = tables.CableTable
 
     default_return_url = 'dcim:cable_list'
 
@@ -2330,6 +2350,7 @@ class InventoryItemDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 
 class InventoryItemBulkImportView(PermissionRequiredMixin, BulkImportView):
 
     permission_required = 'dcim.add_inventoryitem'
 
+    queryset = InventoryItem.objects.all()
 
     model_form = forms.InventoryItemCSVForm
 
     table = tables.InventoryItemTable
 
     default_return_url = 'dcim:inventoryitem_list'
 
@@ -2673,6 +2694,7 @@ class PowerPanelDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 
 class PowerPanelBulkImportView(PermissionRequiredMixin, BulkImportView):
 
     permission_required = 'dcim.add_powerpanel'
 
+    queryset = PowerPanel.objects.all()
 
     model_form = forms.PowerPanelCSVForm
 
     table = tables.PowerPanelTable
 
     default_return_url = 'dcim:powerpanel_list'
 
@@ -2745,6 +2767,7 @@ class PowerFeedDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 
 class PowerFeedBulkImportView(PermissionRequiredMixin, BulkImportView):
 
     permission_required = 'dcim.add_powerfeed'
 
+    queryset = PowerFeed.objects.all()
 
     model_form = forms.PowerFeedCSVForm
 
     table = tables.PowerFeedTable
 
     default_return_url = 'dcim:powerfeed_list'

+ 8 - 0
netbox/ipam/views.py
Просмотреть файл 

@@ -155,6 +155,7 @@ class VRFDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 
 class VRFBulkImportView(PermissionRequiredMixin, BulkImportView):
 
     permission_required = 'ipam.add_vrf'
 
+    queryset = VRF.objects.all()
 
     model_form = forms.VRFCSVForm
 
     table = tables.VRFTable
 
     default_return_url = 'ipam:vrf_list'
 
@@ -271,6 +272,7 @@ class RIREditView(RIRCreateView):
 
 
 class RIRBulkImportView(PermissionRequiredMixin, BulkImportView):
 
     permission_required = 'ipam.add_rir'
 
+    queryset = RIR.objects.all()
 
     model_form = forms.RIRCSVForm
 
     table = tables.RIRTable
 
     default_return_url = 'ipam:rir_list'
 
@@ -380,6 +382,7 @@ class AggregateDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 
 class AggregateBulkImportView(PermissionRequiredMixin, BulkImportView):
 
     permission_required = 'ipam.add_aggregate'
 
+    queryset = Aggregate.objects.all()
 
     model_form = forms.AggregateCSVForm
 
     table = tables.AggregateTable
 
     default_return_url = 'ipam:aggregate_list'
 
@@ -425,6 +428,7 @@ class RoleEditView(RoleCreateView):
 
 
 class RoleBulkImportView(PermissionRequiredMixin, BulkImportView):
 
     permission_required = 'ipam.add_role'
 
+    queryset = Role.objects.all()
 
     model_form = forms.RoleCSVForm
 
     table = tables.RoleTable
 
     default_return_url = 'ipam:role_list'
 
@@ -782,6 +786,7 @@ class IPAddressBulkCreateView(PermissionRequiredMixin, BulkCreateView):
 
 
 class IPAddressBulkImportView(PermissionRequiredMixin, BulkImportView):
 
     permission_required = 'ipam.add_ipaddress'
 
+    queryset = IPAddress.objects.all()
 
     model_form = forms.IPAddressCSVForm
 
     table = tables.IPAddressTable
 
     default_return_url = 'ipam:ipaddress_list'
 
@@ -829,6 +834,7 @@ class VLANGroupEditView(VLANGroupCreateView):
 
 
 class VLANGroupBulkImportView(PermissionRequiredMixin, BulkImportView):
 
     permission_required = 'ipam.add_vlangroup'
 
+    queryset = VLANGroup.objects.all()
 
     model_form = forms.VLANGroupCSVForm
 
     table = tables.VLANGroupTable
 
     default_return_url = 'ipam:vlangroup_list'
 
@@ -952,6 +958,7 @@ class VLANDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 
 class VLANBulkImportView(PermissionRequiredMixin, BulkImportView):
 
     permission_required = 'ipam.add_vlan'
 
+    queryset = VLAN.objects.all()
 
     model_form = forms.VLANCSVForm
 
     table = tables.VLANTable
 
     default_return_url = 'ipam:vlan_list'
 
@@ -1018,6 +1025,7 @@ class ServiceCreateView(PermissionRequiredMixin, ObjectEditView):
 
 
 class ServiceBulkImportView(PermissionRequiredMixin, BulkImportView):
 
     permission_required = 'ipam.add_service'
 
+    queryset = Service.objects.all()
 
     model_form = forms.ServiceCSVForm
 
     table = tables.ServiceTable
 
     default_return_url = 'ipam:service_list'

+ 2 - 0
netbox/secrets/views.py
Просмотреть файл 

@@ -49,6 +49,7 @@ class SecretRoleEditView(SecretRoleCreateView):
 
 
 class SecretRoleBulkImportView(PermissionRequiredMixin, BulkImportView):
 
     permission_required = 'secrets.add_secretrole'
 
+    queryset = SecretRole.objects.all()
 
     model_form = forms.SecretRoleCSVForm
 
     table = tables.SecretRoleTable
 
     default_return_url = 'secrets:secretrole_list'
 
@@ -197,6 +198,7 @@ class SecretDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 
 class SecretBulkImportView(BulkImportView):
 
     permission_required = 'secrets.add_secret'
 
+    queryset = Secret.objects.all()
 
     model_form = forms.SecretCSVForm
 
     table = tables.SecretTable
 
     template_name = 'secrets/secret_import.html'

+ 2 - 0
netbox/tenancy/views.py
Просмотреть файл 

@@ -43,6 +43,7 @@ class TenantGroupEditView(TenantGroupCreateView):
 
 
 class TenantGroupBulkImportView(PermissionRequiredMixin, BulkImportView):
 
     permission_required = 'tenancy.add_tenantgroup'
 
+    queryset = TenantGroup.objects.all()
 
     model_form = forms.TenantGroupCSVForm
 
     table = tables.TenantGroupTable
 
     default_return_url = 'tenancy:tenantgroup_list'
 
@@ -113,6 +114,7 @@ class TenantDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 
 class TenantBulkImportView(PermissionRequiredMixin, BulkImportView):
 
     permission_required = 'tenancy.add_tenant'
 
+    queryset = Tenant.objects.all()
 
     model_form = forms.TenantCSVForm
 
     table = tables.TenantTable
 
     default_return_url = 'tenancy:tenant_list'

+ 10 - 10
netbox/utilities/views.py
Просмотреть файл 

@@ -676,11 +676,11 @@ class BulkEditView(GetReturnURLMixin, View):
 
     """
 
     Edit objects in bulk.
 
 
-    queryset: Custom queryset to use when retrieving objects (e.g. to select related objects)
 
-    filter: FilterSet to apply when deleting by QuerySet
 
-    table: The table used to display devices being edited
 
-    form: The form class used to edit objects in bulk
 
-    template_name: The name of the template
 
+    :param queryset: Custom queryset to use when retrieving objects (e.g. to select related objects)
 
+    :param filter: FilterSet to apply when deleting by QuerySet
 
+    :param table: The table used to display devices being edited
 
+    :param form: The form class used to edit objects in bulk
 
+    :param template_name: The name of the template
 
     """
 
     queryset = None
 
     filterset = None
 
@@ -829,11 +829,11 @@ class BulkDeleteView(GetReturnURLMixin, View):
 
     """
 
     Delete objects in bulk.
 
 
-    queryset: Custom queryset to use when retrieving objects (e.g. to select related objects)
 
-    filter: FilterSet to apply when deleting by QuerySet
 
-    table: The table used to display devices being deleted
 
-    form: The form class used to delete objects in bulk
 
-    template_name: The name of the template
 
+    :param queryset: Custom queryset to use when retrieving objects (e.g. to select related objects)
 
+    :param filter: FilterSet to apply when deleting by QuerySet
 
+    :param table: The table used to display devices being deleted
 
+    :param form: The form class used to delete objects in bulk
 
+    :param template_name: The name of the template
 
     """
 
     queryset = None
 
     filterset = None

+ 4 - 0
netbox/virtualization/views.py
Просмотреть файл 

@@ -41,6 +41,7 @@ class ClusterTypeEditView(ClusterTypeCreateView):
 
 
 class ClusterTypeBulkImportView(PermissionRequiredMixin, BulkImportView):
 
     permission_required = 'virtualization.add_clustertype'
 
+    queryset = ClusterType.objects.all()
 
     model_form = forms.ClusterTypeCSVForm
 
     table = tables.ClusterTypeTable
 
     default_return_url = 'virtualization:clustertype_list'
 
@@ -76,6 +77,7 @@ class ClusterGroupEditView(ClusterGroupCreateView):
 
 
 class ClusterGroupBulkImportView(PermissionRequiredMixin, BulkImportView):
 
     permission_required = 'virtualization.add_clustergroup'
 
+    queryset = ClusterGroup.objects.all()
 
     model_form = forms.ClusterGroupCSVForm
 
     table = tables.ClusterGroupTable
 
     default_return_url = 'virtualization:clustergroup_list'
 
@@ -138,6 +140,7 @@ class ClusterDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 
 class ClusterBulkImportView(PermissionRequiredMixin, BulkImportView):
 
     permission_required = 'virtualization.add_cluster'
 
+    queryset = Cluster.objects.all()
 
     model_form = forms.ClusterCSVForm
 
     table = tables.ClusterTable
 
     default_return_url = 'virtualization:cluster_list'
 
@@ -299,6 +302,7 @@ class VirtualMachineDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 
 class VirtualMachineBulkImportView(PermissionRequiredMixin, BulkImportView):
 
     permission_required = 'virtualization.add_virtualmachine'
 
+    queryset = VirtualMachine.objects.all()
 
     model_form = forms.VirtualMachineCSVForm
 
     table = tables.VirtualMachineTable
 
     default_return_url = 'virtualization:virtualmachine_list'