From 2b0ddd2a98cb35bcdcde0d8e4c62fd9b680f0e74 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 2 Dec 2020 10:08:41 -0500
Subject: [PATCH] Closes #5399: Show options for cable endpoint types during
 bulk import

---
 docs/release-notes/version-2.10.md               | 1 +
 netbox/templates/generic/object_bulk_import.html | 2 +-
 netbox/utilities/forms/fields.py                 | 9 ++++++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/docs/release-notes/version-2.10.md b/docs/release-notes/version-2.10.md
index 196ddf63f2..e071d49410 100644
--- a/docs/release-notes/version-2.10.md
+++ b/docs/release-notes/version-2.10.md
@@ -5,6 +5,7 @@
 ### Enhancements
 
 * [#5274](https://github.com/netbox-community/netbox/issues/5274) - Add REST API support for custom fields
+* [#5399](https://github.com/netbox-community/netbox/issues/5399) - Show options for cable endpoint types during bulk import
 
 ### Bug Fixes
 
diff --git a/netbox/templates/generic/object_bulk_import.html b/netbox/templates/generic/object_bulk_import.html
index 5bd8137220..170cf36655 100644
--- a/netbox/templates/generic/object_bulk_import.html
+++ b/netbox/templates/generic/object_bulk_import.html
@@ -67,7 +67,7 @@ <h1>{% block title %}{{ obj_type|bettertitle }} Bulk Import{% endblock %}</h1>
                                         </td>
                                         <td>
                                             {% if field.STATIC_CHOICES %}
-                                                <button type="button" class="btn btn-primary btn-xs pull-right" data-toggle="modal" data-target="#{{ name }}_choices">
+                                                <button type="button" class="btn btn-link btn-xs pull-right" data-toggle="modal" data-target="#{{ name }}_choices">
                                                     <i class="mdi mdi-help-circle"></i>
                                                 </button>
                                                 <div class="modal fade" id="{{ name }}_choices" tabindex="-1" role="dialog">
diff --git a/netbox/utilities/forms/fields.py b/netbox/utilities/forms/fields.py
index a9904c11a0..a5b76fd8d2 100644
--- a/netbox/utilities/forms/fields.py
+++ b/netbox/utilities/forms/fields.py
@@ -135,13 +135,20 @@ class CSVModelChoiceField(forms.ModelChoiceField):
     def to_python(self, value):
         try:
             return super().to_python(value)
-        except MultipleObjectsReturned as e:
+        except MultipleObjectsReturned:
             raise forms.ValidationError(
                 f'"{value}" is not a unique value for this field; multiple objects were found'
             )
 
 
 class CSVContentTypeField(CSVModelChoiceField):
+    """
+    Reference a ContentType in the form <app>.<model>
+    """
+    STATIC_CHOICES = True
+
+    def prepare_value(self, value):
+        return f'{value.app_label}.{value.model}'
 
     def to_python(self, value):
         try: