NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-15 11:42:52 -06:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Renamed new import view to BulkImportView

Browse Source
This commit is contained in:
Jeremy Stretch 2017-06-05 15:53:41 -04:00
parent 2520d9f400
commit 08c8bd3049
6 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
netbox/circuits/views.py
View File

@ -12,7 +12,7 @@ from django.views.generic import View
from extras.models import Graph, GRAPH_TYPE_PROVIDER from extras.models import Graph, GRAPH_TYPE_PROVIDER
from utilities.forms import ConfirmationForm from utilities.forms import ConfirmationForm
from utilities.views import ( from utilities.views import (
BulkDeleteView, BulkEditView, BulkImportView2, ObjectDeleteView, ObjectEditView, ObjectListView, BulkDeleteView, BulkEditView, BulkImportView, ObjectDeleteView, ObjectEditView, ObjectListView,
) )
from . import filters, forms, tables from . import filters, forms, tables
from .models import Circuit, CircuitTermination, CircuitType, Provider, TERM_SIDE_A, TERM_SIDE_Z from .models import Circuit, CircuitTermination, CircuitType, Provider, TERM_SIDE_A, TERM_SIDE_Z
@ -63,7 +63,7 @@ class ProviderDeleteView(PermissionRequiredMixin, ObjectDeleteView):
default_return_url = 'circuits:provider_list' default_return_url = 'circuits:provider_list'
class ProviderBulkImportView(PermissionRequiredMixin, BulkImportView2): class ProviderBulkImportView(PermissionRequiredMixin, BulkImportView):
permission_required = 'circuits.add_provider' permission_required = 'circuits.add_provider'
model_form = forms.ProviderCSVForm model_form = forms.ProviderCSVForm
table = tables.ProviderTable table = tables.ProviderTable
@ -160,7 +160,7 @@ class CircuitDeleteView(PermissionRequiredMixin, ObjectDeleteView):
default_return_url = 'circuits:circuit_list' default_return_url = 'circuits:circuit_list'
class CircuitBulkImportView(PermissionRequiredMixin, BulkImportView2): class CircuitBulkImportView(PermissionRequiredMixin, BulkImportView):
permission_required = 'circuits.add_circuit' permission_required = 'circuits.add_circuit'
model_form = forms.CircuitCSVForm model_form = forms.CircuitCSVForm
table = tables.CircuitTable table = tables.CircuitTable

16
netbox/dcim/views.py
View File

@ -23,7 +23,7 @@ from extras.models import Graph, TopologyMap, GRAPH_TYPE_INTERFACE, GRAPH_TYPE_S
from utilities.forms import ConfirmationForm from utilities.forms import ConfirmationForm
from utilities.paginator import EnhancedPaginator from utilities.paginator import EnhancedPaginator
from utilities.views import ( from utilities.views import (
BulkDeleteView, BulkEditView, BulkImportView2, ObjectDeleteView, ObjectEditView, ObjectListView, BulkDeleteView, BulkEditView, BulkImportView, ObjectDeleteView, ObjectEditView, ObjectListView,
) )
from . import filters, forms, tables from . import filters, forms, tables
from .models import ( from .models import (
@ -217,7 +217,7 @@ class SiteDeleteView(PermissionRequiredMixin, ObjectDeleteView):
default_return_url = 'dcim:site_list' default_return_url = 'dcim:site_list'
class SiteBulkImportView(PermissionRequiredMixin, BulkImportView2): class SiteBulkImportView(PermissionRequiredMixin, BulkImportView):
permission_required = 'dcim.add_site' permission_required = 'dcim.add_site'
model_form = forms.SiteCSVForm model_form = forms.SiteCSVForm
table = tables.SiteTable table = tables.SiteTable
@ -387,7 +387,7 @@ class RackDeleteView(PermissionRequiredMixin, ObjectDeleteView):
default_return_url = 'dcim:rack_list' default_return_url = 'dcim:rack_list'
class RackBulkImportView(PermissionRequiredMixin, BulkImportView2): class RackBulkImportView(PermissionRequiredMixin, BulkImportView):
permission_required = 'dcim.add_rack' permission_required = 'dcim.add_rack'
model_form = forms.RackCSVForm model_form = forms.RackCSVForm
table = tables.RackImportTable table = tables.RackImportTable
@ -862,7 +862,7 @@ class DeviceDeleteView(PermissionRequiredMixin, ObjectDeleteView):
default_return_url = 'dcim:device_list' default_return_url = 'dcim:device_list'
class DeviceBulkImportView(PermissionRequiredMixin, BulkImportView2): class DeviceBulkImportView(PermissionRequiredMixin, BulkImportView):
permission_required = 'dcim.add_device' permission_required = 'dcim.add_device'
model_form = forms.DeviceCSVForm model_form = forms.DeviceCSVForm
table = tables.DeviceImportTable table = tables.DeviceImportTable
@ -870,7 +870,7 @@ class DeviceBulkImportView(PermissionRequiredMixin, BulkImportView2):
default_return_url = 'dcim:device_list' default_return_url = 'dcim:device_list'
class ChildDeviceBulkImportView(PermissionRequiredMixin, BulkImportView2): class ChildDeviceBulkImportView(PermissionRequiredMixin, BulkImportView):
permission_required = 'dcim.add_device' permission_required = 'dcim.add_device'
model_form = forms.ChildDeviceCSVForm model_form = forms.ChildDeviceCSVForm
table = tables.DeviceImportTable table = tables.DeviceImportTable
@ -1012,7 +1012,7 @@ class ConsolePortBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
parent_cls = Device parent_cls = Device
class ConsoleConnectionsBulkImportView(PermissionRequiredMixin, BulkImportView2): class ConsoleConnectionsBulkImportView(PermissionRequiredMixin, BulkImportView):
permission_required = 'dcim.change_consoleport' permission_required = 'dcim.change_consoleport'
model_form = forms.ConsoleConnectionCSVForm model_form = forms.ConsoleConnectionCSVForm
table = tables.ConsoleConnectionTable table = tables.ConsoleConnectionTable
@ -1234,7 +1234,7 @@ class PowerPortBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
parent_cls = Device parent_cls = Device
class PowerConnectionsBulkImportView(PermissionRequiredMixin, BulkImportView2): class PowerConnectionsBulkImportView(PermissionRequiredMixin, BulkImportView):
permission_required = 'dcim.change_powerport' permission_required = 'dcim.change_powerport'
model_form = forms.PowerConnectionCSVForm model_form = forms.PowerConnectionCSVForm
table = tables.PowerConnectionTable table = tables.PowerConnectionTable
@ -1670,7 +1670,7 @@ def interfaceconnection_delete(request, pk):
}) })
class InterfaceConnectionsBulkImportView(PermissionRequiredMixin, BulkImportView2): class InterfaceConnectionsBulkImportView(PermissionRequiredMixin, BulkImportView):
permission_required = 'dcim.change_interface' permission_required = 'dcim.change_interface'
model_form = forms.InterfaceConnectionCSVForm model_form = forms.InterfaceConnectionCSVForm
table = tables.InterfaceConnectionTable table = tables.InterfaceConnectionTable

12
netbox/ipam/views.py
View File

@ -13,7 +13,7 @@ from django.views.generic import View
from dcim.models import Device from dcim.models import Device
from utilities.paginator import EnhancedPaginator from utilities.paginator import EnhancedPaginator
from utilities.views import ( from utilities.views import (
BulkAddView, BulkDeleteView, BulkEditView, BulkImportView2, ObjectDeleteView, ObjectEditView, ObjectListView, BulkAddView, BulkDeleteView, BulkEditView, BulkImportView, ObjectDeleteView, ObjectEditView, ObjectListView,
) )
from . import filters, forms, tables from . import filters, forms, tables
from .models import ( from .models import (
@ -128,7 +128,7 @@ class VRFDeleteView(PermissionRequiredMixin, ObjectDeleteView):
default_return_url = 'ipam:vrf_list' default_return_url = 'ipam:vrf_list'
class VRFBulkImportView(PermissionRequiredMixin, BulkImportView2): class VRFBulkImportView(PermissionRequiredMixin, BulkImportView):
permission_required = 'ipam.add_vrf' permission_required = 'ipam.add_vrf'
model_form = forms.VRFCSVForm model_form = forms.VRFCSVForm
table = tables.VRFTable table = tables.VRFTable
@ -338,7 +338,7 @@ class AggregateDeleteView(PermissionRequiredMixin, ObjectDeleteView):
default_return_url = 'ipam:aggregate_list' default_return_url = 'ipam:aggregate_list'
class AggregateBulkImportView(PermissionRequiredMixin, BulkImportView2): class AggregateBulkImportView(PermissionRequiredMixin, BulkImportView):
permission_required = 'ipam.add_aggregate' permission_required = 'ipam.add_aggregate'
model_form = forms.AggregateCSVForm model_form = forms.AggregateCSVForm
table = tables.AggregateTable table = tables.AggregateTable
@ -534,7 +534,7 @@ class PrefixDeleteView(PermissionRequiredMixin, ObjectDeleteView):
default_return_url = 'ipam:prefix_list' default_return_url = 'ipam:prefix_list'
class PrefixBulkImportView(PermissionRequiredMixin, BulkImportView2): class PrefixBulkImportView(PermissionRequiredMixin, BulkImportView):
permission_required = 'ipam.add_prefix' permission_required = 'ipam.add_prefix'
model_form = forms.PrefixCSVForm model_form = forms.PrefixCSVForm
table = tables.PrefixTable table = tables.PrefixTable
@ -635,7 +635,7 @@ class IPAddressBulkAddView(PermissionRequiredMixin, BulkAddView):
default_return_url = 'ipam:ipaddress_list' default_return_url = 'ipam:ipaddress_list'
class IPAddressBulkImportView(PermissionRequiredMixin, BulkImportView2): class IPAddressBulkImportView(PermissionRequiredMixin, BulkImportView):
permission_required = 'ipam.add_ipaddress' permission_required = 'ipam.add_ipaddress'
model_form = forms.IPAddressCSVForm model_form = forms.IPAddressCSVForm
table = tables.IPAddressTable table = tables.IPAddressTable
@ -742,7 +742,7 @@ class VLANDeleteView(PermissionRequiredMixin, ObjectDeleteView):
default_return_url = 'ipam:vlan_list' default_return_url = 'ipam:vlan_list'
class VLANBulkImportView(PermissionRequiredMixin, BulkImportView2): class VLANBulkImportView(PermissionRequiredMixin, BulkImportView):
permission_required = 'ipam.add_vlan' permission_required = 'ipam.add_vlan'
model_form = forms.VLANCSVForm model_form = forms.VLANCSVForm
table = tables.VLANTable table = tables.VLANTable

4
netbox/secrets/views.py
View File

@ -13,7 +13,7 @@ from django.views.generic import View
from dcim.models import Device from dcim.models import Device
from utilities.views import ( from utilities.views import (
BulkDeleteView, BulkEditView, BulkImportView2, ObjectDeleteView, ObjectEditView, ObjectListView, BulkDeleteView, BulkEditView, BulkImportView, ObjectDeleteView, ObjectEditView, ObjectListView,
) )
from . import filters, forms, tables from . import filters, forms, tables
from .decorators import userkey_required from .decorators import userkey_required
@ -187,7 +187,7 @@ class SecretDeleteView(PermissionRequiredMixin, ObjectDeleteView):
default_return_url = 'secrets:secret_list' default_return_url = 'secrets:secret_list'
class SecretBulkImportView(BulkImportView2): class SecretBulkImportView(BulkImportView):
permission_required = 'ipam.add_vlan' permission_required = 'ipam.add_vlan'
model_form = forms.SecretCSVForm model_form = forms.SecretCSVForm
table = tables.SecretTable table = tables.SecretTable

4
netbox/tenancy/views.py
View File

@ -10,7 +10,7 @@ from circuits.models import Circuit
from dcim.models import Site, Rack, Device from dcim.models import Site, Rack, Device
from ipam.models import IPAddress, Prefix, VLAN, VRF from ipam.models import IPAddress, Prefix, VLAN, VRF
from utilities.views import ( from utilities.views import (
BulkDeleteView, BulkEditView, BulkImportView2, ObjectDeleteView, ObjectEditView, ObjectListView, BulkDeleteView, BulkEditView, BulkImportView, ObjectDeleteView, ObjectEditView, ObjectListView,
) )
from .models import Tenant, TenantGroup from .models import Tenant, TenantGroup
from . import filters, forms, tables from . import filters, forms, tables
@ -95,7 +95,7 @@ class TenantDeleteView(PermissionRequiredMixin, ObjectDeleteView):
default_return_url = 'tenancy:tenant_list' default_return_url = 'tenancy:tenant_list'
class TenantBulkImportView(PermissionRequiredMixin, BulkImportView2): class TenantBulkImportView(PermissionRequiredMixin, BulkImportView):
permission_required = 'tenancy.add_tenant' permission_required = 'tenancy.add_tenant'
model_form = forms.TenantCSVForm model_form = forms.TenantCSVForm
table = tables.TenantTable table = tables.TenantTable

2
netbox/utilities/views.py
View File

@ -369,7 +369,7 @@ class BulkAddView(View):
}) })
class BulkImportView2(View): class BulkImportView(View):
""" """
Import objects in bulk (CSV format). Import objects in bulk (CSV format).