-
-
-
-
-
- | Domain |
- {{ object.domain|placeholder }} |
-
-
- | Master |
- {{ object.master|linkify }} |
-
-
-
-
- {% include 'inc/panels/custom_fields.html' %}
- {% include 'inc/panels/tags.html' %}
- {% plugin_left_page object %}
+
+
+
+
+
+ | Domain |
+ {{ object.domain|placeholder }} |
+
+
+ | Master |
+ {{ object.master|linkify }} |
+
+
+
+
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/tags.html' %}
+ {% plugin_left_page object %}
-
-
-
-
-
- | Device |
- Position |
- Master |
- Priority |
-
- {% for vc_member in members %}
-
-
- {{ vc_member|linkify }}
- |
-
- {% badge vc_member.vc_position show_empty=True %}
- |
-
- {% if object.master == vc_member %}
- {% checkmark True %}
- {% endif %}
- |
-
- {{ vc_member.vc_priority|placeholder }}
- |
-
- {% endfor %}
-
-
- {% if perms.dcim.change_virtualchassis %}
-
- {% endif %}
+
+
+
+
+
+ | Device |
+ Position |
+ Master |
+ Priority |
+
+ {% for vc_member in members %}
+
+
+ {{ vc_member|linkify }}
+ |
+
+ {% badge vc_member.vc_position show_empty=True %}
+ |
+
+ {% if object.master == vc_member %}
+ {% checkmark True %}
+ {% endif %}
+ |
+
+ {{ vc_member.vc_priority|placeholder }}
+ |
+
+ {% endfor %}
+
- {% plugin_right_page object %}
+ {% if perms.dcim.change_virtualchassis %}
+
+ {% endif %}
+
+ {% plugin_right_page object %}
-
- {% plugin_full_width_page object %}
-
+
+ {% plugin_full_width_page object %}
+
{% endblock %}
diff --git a/netbox/templates/ipam/ipaddress.html b/netbox/templates/ipam/ipaddress.html
index 96a76cf8c..7981ea0fe 100644
--- a/netbox/templates/ipam/ipaddress.html
+++ b/netbox/templates/ipam/ipaddress.html
@@ -134,6 +134,24 @@
{% include 'inc/panel_table.html' with table=related_ips_table heading='Related IP Addresses' %}
+
+
+
+ {% if services %}
+
+ {% for service in services %}
+ {% include 'ipam/inc/service.html' %}
+ {% endfor %}
+
+ {% else %}
+
+ None
+
+ {% endif %}
+
+
{% plugin_right_page object %}
diff --git a/netbox/tenancy/filtersets.py b/netbox/tenancy/filtersets.py
index 8ca4ae29c..dd14a412b 100644
--- a/netbox/tenancy/filtersets.py
+++ b/netbox/tenancy/filtersets.py
@@ -112,6 +112,12 @@ class ContactModelFilterSet(django_filters.FilterSet):
queryset=ContactRole.objects.all(),
label='Contact Role'
)
+ contact_group = TreeNodeMultipleChoiceFilter(
+ queryset=ContactGroup.objects.all(),
+ field_name='contacts__contact__group',
+ lookup_expr='in',
+ label='Contact group',
+ )
#
diff --git a/netbox/tenancy/forms/filtersets.py b/netbox/tenancy/forms/filtersets.py
index 15d7773b7..02589d733 100644
--- a/netbox/tenancy/forms/filtersets.py
+++ b/netbox/tenancy/forms/filtersets.py
@@ -32,7 +32,7 @@ class TenantFilterForm(ContactModelFilterForm, NetBoxModelFilterSetForm):
model = Tenant
fieldsets = (
(None, ('q', 'tag', 'group_id')),
- ('Contacts', ('contact', 'contact_role'))
+ ('Contacts', ('contact', 'contact_role', 'contact_group'))
)
group_id = DynamicModelMultipleChoiceField(
queryset=TenantGroup.objects.all(),
diff --git a/netbox/tenancy/forms/forms.py b/netbox/tenancy/forms/forms.py
index 5dcad1d43..5e78bc540 100644
--- a/netbox/tenancy/forms/forms.py
+++ b/netbox/tenancy/forms/forms.py
@@ -58,3 +58,8 @@ class ContactModelFilterForm(forms.Form):
required=False,
label=_('Contact Role')
)
+ contact_group = DynamicModelMultipleChoiceField(
+ queryset=ContactGroup.objects.all(),
+ required=False,
+ label=_('Contact Group')
+ )
diff --git a/netbox/utilities/forms/fields/dynamic.py b/netbox/utilities/forms/fields/dynamic.py
index f83fc6a7c..68e71610c 100644
--- a/netbox/utilities/forms/fields/dynamic.py
+++ b/netbox/utilities/forms/fields/dynamic.py
@@ -88,7 +88,12 @@ class DynamicModelChoiceMixin:
# Modify the QuerySet of the field before we return it. Limit choices to any data already bound: Options
# will be populated on-demand via the APISelect widget.
data = bound_field.value()
+
if data:
+ # When the field is multiple choice pass the data as a list if it's not already
+ if isinstance(bound_field.field, DynamicModelMultipleChoiceField) and not type(data) is list:
+ data = [data]
+
field_name = getattr(self, 'to_field_name') or 'pk'
filter = self.filter(field_name=field_name)
try:
@@ -130,11 +135,12 @@ class DynamicModelMultipleChoiceField(DynamicModelChoiceMixin, forms.ModelMultip
widget = widgets.APISelectMultiple
def clean(self, value):
- """
- When null option is enabled and "None" is sent as part of a form to be submitted, it is sent as the
- string 'null'. This will check for that condition and gracefully handle the conversion to a NoneType.
- """
+ value = value or []
+
+ # When null option is enabled and "None" is sent as part of a form to be submitted, it is sent as the
+ # string 'null'. This will check for that condition and gracefully handle the conversion to a NoneType.
if self.null_option is not None and settings.FILTERS_NULL_CHOICE_VALUE in value:
value = [v for v in value if v != settings.FILTERS_NULL_CHOICE_VALUE]
return [None, *value]
+
return super().clean(value)
diff --git a/netbox/virtualization/forms/filtersets.py b/netbox/virtualization/forms/filtersets.py
index b3da87f7a..e15a76a43 100644
--- a/netbox/virtualization/forms/filtersets.py
+++ b/netbox/virtualization/forms/filtersets.py
@@ -29,6 +29,10 @@ class ClusterTypeFilterForm(NetBoxModelFilterSetForm):
class ClusterGroupFilterForm(ContactModelFilterForm, NetBoxModelFilterSetForm):
model = ClusterGroup
tag = TagFilterField(model)
+ fieldsets = (
+ (None, ('q', 'tag')),
+ ('Contacts', ('contact', 'contact_role', 'contact_group')),
+ )
class ClusterFilterForm(TenancyFilterForm, ContactModelFilterForm, NetBoxModelFilterSetForm):
@@ -38,7 +42,7 @@ class ClusterFilterForm(TenancyFilterForm, ContactModelFilterForm, NetBoxModelFi
('Attributes', ('group_id', 'type_id', 'status')),
('Location', ('region_id', 'site_group_id', 'site_id')),
('Tenant', ('tenant_group_id', 'tenant_id')),
- ('Contacts', ('contact', 'contact_role')),
+ ('Contacts', ('contact', 'contact_role', 'contact_group')),
)
type_id = DynamicModelMultipleChoiceField(
queryset=ClusterType.objects.all(),
@@ -91,7 +95,7 @@ class VirtualMachineFilterForm(
('Location', ('region_id', 'site_group_id', 'site_id')),
('Attriubtes', ('status', 'role_id', 'platform_id', 'mac_address', 'has_primary_ip', 'local_context_data')),
('Tenant', ('tenant_group_id', 'tenant_id')),
- ('Contacts', ('contact', 'contact_role')),
+ ('Contacts', ('contact', 'contact_role', 'contact_group')),
)
cluster_group_id = DynamicModelMultipleChoiceField(
queryset=ClusterGroup.objects.all(),
diff --git a/requirements.txt b/requirements.txt
index 0a15fcf20..293a33542 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -18,10 +18,10 @@ gunicorn==20.1.0
Jinja2==3.1.2
Markdown==3.3.7
markdown-include==0.6.0
-mkdocs-material==8.2.14
-mkdocstrings[python-legacy]==0.18.1
+mkdocs-material==8.2.16
+mkdocstrings[python-legacy]==0.19.0
netaddr==0.8.0
-Pillow==9.1.0
+Pillow==9.1.1
psycopg2-binary==2.9.3
PyYAML==6.0
sentry-sdk==1.5.12