-
+
{% include 'extras/htmx/script_result.html' %}
diff --git a/netbox/tenancy/forms/bulk_import.py b/netbox/tenancy/forms/bulk_import.py
index f9b8accd9ac..0aec0e28fc0 100644
--- a/netbox/tenancy/forms/bulk_import.py
+++ b/netbox/tenancy/forms/bulk_import.py
@@ -1,9 +1,11 @@
+from django.contrib.contenttypes.models import ContentType
from django.utils.translation import gettext as _
from netbox.forms import NetBoxModelImportForm
from tenancy.models import *
-from utilities.forms.fields import CSVModelChoiceField, SlugField
+from utilities.forms.fields import CSVContentTypeField, CSVModelChoiceField, SlugField
__all__ = (
+ 'ContactAssignmentImportForm',
'ContactImportForm',
'ContactGroupImportForm',
'ContactRoleImportForm',
@@ -81,3 +83,27 @@ class ContactImportForm(NetBoxModelImportForm):
class Meta:
model = Contact
fields = ('name', 'title', 'phone', 'email', 'address', 'link', 'group', 'description', 'comments', 'tags')
+
+
+class ContactAssignmentImportForm(NetBoxModelImportForm):
+ content_type = CSVContentTypeField(
+ queryset=ContentType.objects.all(),
+ help_text=_("One or more assigned object types")
+ )
+ contact = CSVModelChoiceField(
+ queryset=Contact.objects.all(),
+ to_field_name='name',
+ help_text=_('Assigned contact')
+ )
+ role = CSVModelChoiceField(
+ queryset=ContactRole.objects.all(),
+ to_field_name='name',
+ help_text=_('Assigned role')
+ )
+
+ # Remove the tags field added by NetBoxModelImportForm (unsupported by ContactAssignment)
+ tags = None
+
+ class Meta:
+ model = ContactAssignment
+ fields = ('content_type', 'object_id', 'contact', 'priority', 'role')
diff --git a/netbox/tenancy/urls.py b/netbox/tenancy/urls.py
index 87491ea0e5f..ad9908c6270 100644
--- a/netbox/tenancy/urls.py
+++ b/netbox/tenancy/urls.py
@@ -49,6 +49,7 @@
# Contact assignments
path('contact-assignments/', views.ContactAssignmentListView.as_view(), name='contactassignment_list'),
path('contact-assignments/add/', views.ContactAssignmentEditView.as_view(), name='contactassignment_add'),
+ path('contact-assignments/import/', views.ContactAssignmentBulkImportView.as_view(), name='contactassignment_import'),
path('contact-assignments/edit/', views.ContactAssignmentBulkEditView.as_view(), name='contactassignment_bulk_edit'),
path('contact-assignments/delete/', views.ContactAssignmentBulkDeleteView.as_view(), name='contactassignment_bulk_delete'),
path('contact-assignments/
/', include(get_model_urls('tenancy', 'contactassignment'))),
diff --git a/netbox/tenancy/views.py b/netbox/tenancy/views.py
index bbe901bded8..23020e79423 100644
--- a/netbox/tenancy/views.py
+++ b/netbox/tenancy/views.py
@@ -420,6 +420,11 @@ class ContactAssignmentBulkEditView(generic.BulkEditView):
form = forms.ContactAssignmentBulkEditForm
+class ContactAssignmentBulkImportView(generic.BulkImportView):
+ queryset = ContactAssignment.objects.all()
+ model_form = forms.ContactAssignmentImportForm
+
+
class ContactAssignmentBulkDeleteView(generic.BulkDeleteView):
queryset = ContactAssignment.objects.all()
filterset = filtersets.ContactAssignmentFilterSet
diff --git a/netbox/utilities/utils.py b/netbox/utilities/utils.py
index 114397dae35..9524e242cc3 100644
--- a/netbox/utilities/utils.py
+++ b/netbox/utilities/utils.py
@@ -519,6 +519,8 @@ def clean_html(html, schemes):
"h1": ["id"], "h2": ["id"], "h3": ["id"], "h4": ["id"], "h5": ["id"], "h6": ["id"],
"a": ["href", "title"],
"img": ["src", "title", "alt"],
+ "th": ["align"],
+ "td": ["align"],
}
return bleach.clean(
diff --git a/requirements.txt b/requirements.txt
index 3750e724b18..f1235fa2cac 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
bleach==6.0.0
-boto3==1.28.1
+boto3==1.28.14
Django==4.1.10
django-cors-headers==4.2.0
django-debug-toolbar==4.1.0
@@ -15,21 +15,21 @@ django-tables2==2.6.0
django-taggit==4.0.0
django-timezone-field==5.1
djangorestframework==3.14.0
-drf-spectacular==0.26.3
+drf-spectacular==0.26.4
drf-spectacular-sidecar==2023.7.1
dulwich==0.21.5
feedparser==6.0.10
graphene-django==3.0.0
-gunicorn==20.1.0
+gunicorn==21.2.0
Jinja2==3.1.2
Markdown==3.3.7
-mkdocs-material==9.1.18
+mkdocs-material==9.1.21
mkdocstrings[python-legacy]==0.22.0
netaddr==0.8.0
Pillow==10.0.0
psycopg2-binary==2.9.6
-PyYAML==6.0
-sentry-sdk==1.28.0
+PyYAML==6.0.1
+sentry-sdk==1.28.1
social-auth-app-django==5.2.0
social-auth-core[openidconnect]==4.4.2
svgwrite==1.4.3