Просмотр исходного кода

Closes #5399: Show options for cable endpoint types during bulk import

Jeremy Stretch 5 лет назад
Родитель
Сommit
2b0ddd2a98

+ 1 - 0
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
 

+ 1 - 1
netbox/templates/generic/object_bulk_import.html

@@ -67,7 +67,7 @@
                                         </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">

+ 8 - 1
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: