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:18:21 -07:00
parent 8c62465b81
commit a843765d0c
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
netbox/tenancy/forms/bulk_edit.py
View File

@ -5,7 +5,7 @@ from netbox.forms import NetBoxModelBulkEditForm
from tenancy.choices import ContactPriorityChoices from tenancy.choices import ContactPriorityChoices
from tenancy.models import * from tenancy.models import *
from utilities.forms import add_blank_choice from utilities.forms import add_blank_choice
from utilities.forms.fields import CommentField, DynamicModelChoiceField from utilities.forms.fields import CommentField, DynamicModelChoiceField, DynamicModelMultipleChoiceField
from utilities.forms.rendering import FieldSet from utilities.forms.rendering import FieldSet
__all__ = ( __all__ = (
@ -90,8 +90,8 @@ class ContactRoleBulkEditForm(NetBoxModelBulkEditForm):
class ContactBulkEditForm(NetBoxModelBulkEditForm): class ContactBulkEditForm(NetBoxModelBulkEditForm):
group = DynamicModelChoiceField( groups = DynamicModelMultipleChoiceField(
label=_('Group'), label=_('Groups'),
queryset=ContactGroup.objects.all(), queryset=ContactGroup.objects.all(),
required=False required=False
) )
@ -127,9 +127,9 @@ class ContactBulkEditForm(NetBoxModelBulkEditForm):
model = Contact model = Contact
fieldsets = ( fieldsets = (
FieldSet('group', 'title', 'phone', 'email', 'address', 'link', 'description'), FieldSet('groups', 'title', 'phone', 'email', 'address', 'link', 'description'),
) )
nullable_fields = ('group', 'title', 'phone', 'email', 'address', 'link', 'description', 'comments') nullable_fields = ('groups', 'title', 'phone', 'email', 'address', 'link', 'description', 'comments')
class ContactAssignmentBulkEditForm(NetBoxModelBulkEditForm): class ContactAssignmentBulkEditForm(NetBoxModelBulkEditForm):

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

@ -208,13 +208,13 @@ class ContactTestCase(ViewTestCases.PrimaryObjectViewTestCase):
cls.form_data = { cls.form_data = {
'name': 'Contact X', 'name': 'Contact X',
'group': contact_groups[1].pk, 'groups': [contact_groups[1].pk],
'comments': 'Some comments', 'comments': 'Some comments',
'tags': [t.pk for t in tags], 'tags': [t.pk for t in tags],
} }
cls.csv_data = ( cls.csv_data = (
"group,name", "groups,name",
"Contact Group 1,Contact 4", "Contact Group 1,Contact 4",
"Contact Group 1,Contact 5", "Contact Group 1,Contact 5",
"Contact Group 1,Contact 6", "Contact Group 1,Contact 6",
@ -228,7 +228,7 @@ class ContactTestCase(ViewTestCases.PrimaryObjectViewTestCase):
) )
cls.bulk_edit_data = { cls.bulk_edit_data = {
'group': contact_groups[1].pk, 'description': "New description",
} }