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

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

Browse Source
This commit is contained in:
Jeremy Stretch 2020-12-02 10:08:41 -05:00
parent cc271aefe1
commit 2b0ddd2a98
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/release-notes/version-2.10.md
View File

@ -5,6 +5,7 @@
### Enhancements ### Enhancements
* [#5274](https://github.com/netbox-community/netbox/issues/5274) - Add REST API support for custom fields * [#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 ### Bug Fixes

2
netbox/templates/generic/object_bulk_import.html
View File

@ -67,7 +67,7 @@
</td> </td>
<td> <td>
{% if field.STATIC_CHOICES %} {% 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> <i class="mdi mdi-help-circle"></i>
</button> </button>
<div class="modal fade" id="{{ name }}_choices" tabindex="-1" role="dialog"> <div class="modal fade" id="{{ name }}_choices" tabindex="-1" role="dialog">

9
netbox/utilities/forms/fields.py
View File

@ -135,13 +135,20 @@ class CSVModelChoiceField(forms.ModelChoiceField):
def to_python(self, value): def to_python(self, value):
try: try:
return super().to_python(value) return super().to_python(value)
except MultipleObjectsReturned as e: except MultipleObjectsReturned:
raise forms.ValidationError( raise forms.ValidationError(
f'"{value}" is not a unique value for this field; multiple objects were found' f'"{value}" is not a unique value for this field; multiple objects were found'
) )
class CSVContentTypeField(CSVModelChoiceField): 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): def to_python(self, value):
try: try: