NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-27 10:58:37 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

17170 fixes

Browse Source
This commit is contained in:
Arthur 2025-03-12 15:43:03 -07:00
parent a843765d0c
commit 1b2c96bc7b
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
netbox/tenancy/forms/bulk_import.py
View File

@ -77,17 +77,10 @@ class ContactRoleImportForm(NetBoxModelImportForm):
class ContactImportForm(NetBoxModelImportForm): class ContactImportForm(NetBoxModelImportForm):
group = CSVModelChoiceField(
label=_('Group'),
queryset=ContactGroup.objects.all(),
required=False,
to_field_name='name',
help_text=_('Assigned group')
)
class Meta: class Meta:
model = Contact model = Contact
fields = ('name', 'title', 'phone', 'email', 'address', 'link', 'group', 'description', 'comments', 'tags') fields = ('name', 'title', 'phone', 'email', 'address', 'link', 'description', 'comments', 'tags')
class ContactAssignmentImportForm(NetBoxModelImportForm): class ContactAssignmentImportForm(NetBoxModelImportForm):

8
netbox/tenancy/tests/test_views.py
View File

@ -214,10 +214,10 @@ class ContactTestCase(ViewTestCases.PrimaryObjectViewTestCase):
} }
cls.csv_data = ( cls.csv_data = (
"groups,name", "name",
"Contact Group 1,Contact 4", "Contact 4",
"Contact Group 1,Contact 5", "Contact 5",
"Contact Group 1,Contact 6", "Contact 6",
) )
cls.csv_update_data = ( cls.csv_update_data = (