From b6f8c248de56d9db9db76ce9226cf4ec34d8c2f4 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 11 Dec 2019 17:07:56 -0500
Subject: [PATCH] Addressed lingering TODOs

---
 netbox/dcim/choices.py |  2 --
 netbox/dcim/views.py   | 24 ++++++++----------------
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/netbox/dcim/choices.py b/netbox/dcim/choices.py
index 15b3ce680..e80a6f9f1 100644
--- a/netbox/dcim/choices.py
+++ b/netbox/dcim/choices.py
@@ -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'
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 5a15198ba..d89a08f2e 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -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):