NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-23 04:22:01 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Addressed lingering TODOs

Browse Source
This commit is contained in:
Jeremy Stretch 2019-12-11 17:07:56 -05:00
parent b16be577e3
commit b6f8c248de
2 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/dcim/choices.py
View File

@ -232,7 +232,6 @@ class ConsolePortTypeChoices(ChoiceSet):
class PowerPortTypeChoices(ChoiceSet):
# TODO: Add more power port types
# IEC 60320
TYPE_IEC_C6 = 'iec-60320-c6'
TYPE_IEC_C8 = 'iec-60320-c8'
@ -347,7 +346,6 @@ class PowerPortTypeChoices(ChoiceSet):
class PowerOutletTypeChoices(ChoiceSet):
# TODO: Add more power outlet types
# IEC 60320
TYPE_IEC_C5 = 'iec-60320-c5'
TYPE_IEC_C7 = 'iec-60320-c7'

24
netbox/dcim/views.py
View File

@ -1228,8 +1228,7 @@ class ConsolePortBulkImportView(PermissionRequiredMixin, BulkImportView):
permission_required = 'dcim.add_consoleport'
model_form = forms.ConsolePortCSVForm
table = tables.ConsolePortImportTable
# TODO: change after netbox-community#3564 has been implemented
# default_return_url = 'dcim:consoleport_list'
default_return_url = 'dcim:consoleport_list'
class ConsolePortBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
@ -1277,8 +1276,7 @@ class ConsoleServerPortBulkImportView(PermissionRequiredMixin, BulkImportView):
permission_required = 'dcim.add_consoleserverport'
model_form = forms.ConsoleServerPortCSVForm
table = tables.ConsoleServerPortImportTable
# TODO: change after netbox-community#3564 has been implemented
# default_return_url = 'dcim:consoleserverport_list'
default_return_url = 'dcim:consoleserverport_list'
class ConsoleServerPortBulkEditView(PermissionRequiredMixin, BulkEditView):
@ -1346,8 +1344,7 @@ class PowerPortBulkImportView(PermissionRequiredMixin, BulkImportView):
permission_required = 'dcim.add_powerport'
model_form = forms.PowerPortCSVForm
table = tables.PowerPortImportTable
# TODO: change after netbox-community#3564 has been implemented
# default_return_url = 'dcim:powerport_list'
default_return_url = 'dcim:powerport_list'
class PowerPortBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
@ -1395,8 +1392,7 @@ class PowerOutletBulkImportView(PermissionRequiredMixin, BulkImportView):
permission_required = 'dcim.add_poweroutlet'
model_form = forms.PowerOutletCSVForm
table = tables.PowerOutletImportTable
# TODO: change after netbox-community#3564 has been implemented
# default_return_url = 'dcim:poweroutlet_list'
default_return_url = 'dcim:poweroutlet_list'
class PowerOutletBulkEditView(PermissionRequiredMixin, BulkEditView):
@ -1501,8 +1497,7 @@ class InterfaceBulkImportView(PermissionRequiredMixin, BulkImportView):
permission_required = 'dcim.add_interface'
model_form = forms.InterfaceCSVForm
table = tables.InterfaceImportTable
# TODO: change after netbox-community#3564 has been implemented
# default_return_url = 'dcim:interface_list'
default_return_url = 'dcim:interface_list'
class InterfaceBulkEditView(PermissionRequiredMixin, BulkEditView):
@ -1570,8 +1565,7 @@ class FrontPortBulkImportView(PermissionRequiredMixin, BulkImportView):
permission_required = 'dcim.add_frontport'
model_form = forms.FrontPortCSVForm
table = tables.FrontPortImportTable
# TODO: change after netbox-community#3564 has been implemented
# default_return_url = 'dcim:frontport_list'
default_return_url = 'dcim:frontport_list'
class FrontPortBulkEditView(PermissionRequiredMixin, BulkEditView):
@ -1639,8 +1633,7 @@ class RearPortBulkImportView(PermissionRequiredMixin, BulkImportView):
permission_required = 'dcim.add_rearport'
model_form = forms.RearPortCSVForm
table = tables.RearPortImportTable
# TODO: change after netbox-community#3564 has been implemented
# default_return_url = 'dcim:rearport_list'
default_return_url = 'dcim:rearport_list'
class RearPortBulkEditView(PermissionRequiredMixin, BulkEditView):
@ -1779,8 +1772,7 @@ class DeviceBayBulkImportView(PermissionRequiredMixin, BulkImportView):
permission_required = 'dcim.add_devicebay'
model_form = forms.DeviceBayCSVForm
table = tables.DeviceBayImportTable
# TODO: change after netbox-community#3564 has been implemented
# default_return_url = 'dcim:devicebay_list'
default_return_url = 'dcim:devicebay_list'
class DeviceBayBulkRenameView(PermissionRequiredMixin, BulkRenameView):