- {% search_options %}
+ {% search_options request %}
@@ -45,7 +45,7 @@
{# Search bar #}
- {% search_options %}
+ {% search_options request %}
{# Proflie/login button #}
diff --git a/netbox/templates/dcim/inc/cable_termination.html b/netbox/templates/dcim/inc/cable_termination.html
index 1ba3d05c9..c9f3f0d4a 100644
--- a/netbox/templates/dcim/inc/cable_termination.html
+++ b/netbox/templates/dcim/inc/cable_termination.html
@@ -8,6 +8,22 @@
Type
diff --git a/netbox/templates/dcim/inc/nonracked_devices.html b/netbox/templates/dcim/inc/nonracked_devices.html
new file mode 100644
index 000000000..f1b669eb9
--- /dev/null
+++ b/netbox/templates/dcim/inc/nonracked_devices.html
@@ -0,0 +1,62 @@
+{% load helpers %}
+
+
+
+
+{% if nonracked_devices %}
+
+
+ Name
+ Role
+ Type
+ Parent Device
+
+ {% for device in nonracked_devices %}
+
+
+ {{ device }}
+
+ {{ device.device_role }}
+ {{ device.device_type }}
+ {% if device.parent_bay %}
+ {{ device.parent_bay.device }} {{ device.parent_bay }}
+ {% else %}
+ —
+ {% endif %}
+
+ {% endfor %}
+
+ {% else %}
+
+ None
+
+ {% endif %}
+
+ {% if perms.dcim.add_device %}
+ {% if object|meta:'verbose_name' == 'rack' %}
+
+ {% elif object|meta:'verbose_name' == 'site' %}
+
+ {% elif object|meta:'verbose_name' == 'location' %}
+
+ {% endif %}
+ {% endif %}
+
{% include 'inc/panels/custom_fields.html' %}
{% include 'inc/panels/contacts.html' %}
+ {% include 'dcim/inc/nonracked_devices.html' %}
{% include 'inc/panels/image_attachments.html' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html
index 93bd21fd9..4eb94a0ce 100644
--- a/netbox/templates/dcim/rack.html
+++ b/netbox/templates/dcim/rack.html
@@ -288,50 +288,7 @@
-
-
-
- {% if nonracked_devices %}
-
-
- Name
- Role
- Type
- Parent Device
-
- {% for device in nonracked_devices %}
-
-
- {{ device }}
-
- {{ device.device_role }}
- {{ device.device_type }}
- {% if device.parent_bay %}
- {{ device.parent_bay.device }} {{ device.parent_bay }}
- {% else %}
- —
- {% endif %}
-
- {% endfor %}
-
- {% else %}
-
- None
-
- {% endif %}
-
- {% if perms.dcim.add_device %}
-
- {% endif %}
-
diff --git a/netbox/tenancy/filtersets.py b/netbox/tenancy/filtersets.py
index c7e766389..3ff45ab5c 100644
--- a/netbox/tenancy/filtersets.py
+++ b/netbox/tenancy/filtersets.py
@@ -11,6 +11,7 @@ __all__ = (
'ContactAssignmentFilterSet',
'ContactFilterSet',
'ContactGroupFilterSet',
+ 'ContactModelFilterSet',
'ContactRoleFilterSet',
'TenancyFilterSet',
'TenantFilterSet',
@@ -18,92 +19,6 @@ __all__ = (
)
-#
-# Tenancy
-#
-
-class TenantGroupFilterSet(OrganizationalModelFilterSet):
- parent_id = django_filters.ModelMultipleChoiceFilter(
- queryset=TenantGroup.objects.all(),
- label='Tenant group (ID)',
- )
- parent = django_filters.ModelMultipleChoiceFilter(
- field_name='parent__slug',
- queryset=TenantGroup.objects.all(),
- to_field_name='slug',
- label='Tenant group (slug)',
- )
- tag = TagFilter()
-
- class Meta:
- model = TenantGroup
- fields = ['id', 'name', 'slug', 'description']
-
-
-class TenantFilterSet(PrimaryModelFilterSet):
- q = django_filters.CharFilter(
- method='search',
- label='Search',
- )
- group_id = TreeNodeMultipleChoiceFilter(
- queryset=TenantGroup.objects.all(),
- field_name='group',
- lookup_expr='in',
- label='Tenant group (ID)',
- )
- group = TreeNodeMultipleChoiceFilter(
- queryset=TenantGroup.objects.all(),
- field_name='group',
- lookup_expr='in',
- to_field_name='slug',
- label='Tenant group (slug)',
- )
- tag = TagFilter()
-
- class Meta:
- model = Tenant
- fields = ['id', 'name', 'slug', 'description']
-
- def search(self, queryset, name, value):
- if not value.strip():
- return queryset
- return queryset.filter(
- Q(name__icontains=value) |
- Q(slug__icontains=value) |
- Q(description__icontains=value) |
- Q(comments__icontains=value)
- )
-
-
-class TenancyFilterSet(django_filters.FilterSet):
- """
- An inheritable FilterSet for models which support Tenant assignment.
- """
- tenant_group_id = TreeNodeMultipleChoiceFilter(
- queryset=TenantGroup.objects.all(),
- field_name='tenant__group',
- lookup_expr='in',
- label='Tenant Group (ID)',
- )
- tenant_group = TreeNodeMultipleChoiceFilter(
- queryset=TenantGroup.objects.all(),
- field_name='tenant__group',
- to_field_name='slug',
- lookup_expr='in',
- label='Tenant Group (slug)',
- )
- tenant_id = django_filters.ModelMultipleChoiceFilter(
- queryset=Tenant.objects.all(),
- label='Tenant (ID)',
- )
- tenant = django_filters.ModelMultipleChoiceFilter(
- queryset=Tenant.objects.all(),
- field_name='tenant__slug',
- to_field_name='slug',
- label='Tenant (slug)',
- )
-
-
#
# Contacts
#
@@ -191,3 +106,102 @@ class ContactAssignmentFilterSet(ChangeLoggedModelFilterSet):
class Meta:
model = ContactAssignment
fields = ['id', 'content_type_id', 'object_id', 'priority']
+
+
+class ContactModelFilterSet(django_filters.FilterSet):
+ contact = django_filters.ModelMultipleChoiceFilter(
+ field_name='contacts__contact',
+ queryset=Contact.objects.all(),
+ label='Contact',
+ )
+ contact_role = django_filters.ModelMultipleChoiceFilter(
+ field_name='contacts__role',
+ queryset=ContactRole.objects.all(),
+ label='Contact Role'
+ )
+
+
+#
+# Tenancy
+#
+
+class TenantGroupFilterSet(OrganizationalModelFilterSet):
+ parent_id = django_filters.ModelMultipleChoiceFilter(
+ queryset=TenantGroup.objects.all(),
+ label='Tenant group (ID)',
+ )
+ parent = django_filters.ModelMultipleChoiceFilter(
+ field_name='parent__slug',
+ queryset=TenantGroup.objects.all(),
+ to_field_name='slug',
+ label='Tenant group (slug)',
+ )
+ tag = TagFilter()
+
+ class Meta:
+ model = TenantGroup
+ fields = ['id', 'name', 'slug', 'description']
+
+
+class TenantFilterSet(PrimaryModelFilterSet, ContactModelFilterSet):
+ q = django_filters.CharFilter(
+ method='search',
+ label='Search',
+ )
+ group_id = TreeNodeMultipleChoiceFilter(
+ queryset=TenantGroup.objects.all(),
+ field_name='group',
+ lookup_expr='in',
+ label='Tenant group (ID)',
+ )
+ group = TreeNodeMultipleChoiceFilter(
+ queryset=TenantGroup.objects.all(),
+ field_name='group',
+ lookup_expr='in',
+ to_field_name='slug',
+ label='Tenant group (slug)',
+ )
+ tag = TagFilter()
+
+ class Meta:
+ model = Tenant
+ fields = ['id', 'name', 'slug', 'description']
+
+ def search(self, queryset, name, value):
+ if not value.strip():
+ return queryset
+ return queryset.filter(
+ Q(name__icontains=value) |
+ Q(slug__icontains=value) |
+ Q(description__icontains=value) |
+ Q(comments__icontains=value)
+ )
+
+
+class TenancyFilterSet(django_filters.FilterSet):
+ """
+ An inheritable FilterSet for models which support Tenant assignment.
+ """
+ tenant_group_id = TreeNodeMultipleChoiceFilter(
+ queryset=TenantGroup.objects.all(),
+ field_name='tenant__group',
+ lookup_expr='in',
+ label='Tenant Group (ID)',
+ )
+ tenant_group = TreeNodeMultipleChoiceFilter(
+ queryset=TenantGroup.objects.all(),
+ field_name='tenant__group',
+ to_field_name='slug',
+ lookup_expr='in',
+ label='Tenant Group (slug)',
+ )
+ tenant_id = django_filters.ModelMultipleChoiceFilter(
+ queryset=Tenant.objects.all(),
+ label='Tenant (ID)',
+ )
+ tenant = django_filters.ModelMultipleChoiceFilter(
+ queryset=Tenant.objects.all(),
+ field_name='tenant__slug',
+ to_field_name='slug',
+ label='Tenant (slug)',
+ )
diff --git a/netbox/tenancy/forms/filtersets.py b/netbox/tenancy/forms/filtersets.py
index 7849e2171..ada279d9d 100644
--- a/netbox/tenancy/forms/filtersets.py
+++ b/netbox/tenancy/forms/filtersets.py
@@ -2,6 +2,7 @@ from django.utils.translation import gettext as _
from extras.forms import CustomFieldModelFilterForm
from tenancy.models import *
+from tenancy.forms import ContactModelFilterForm
from utilities.forms import DynamicModelMultipleChoiceField, TagFilterField
__all__ = (
@@ -27,11 +28,12 @@ class TenantGroupFilterForm(CustomFieldModelFilterForm):
tag = TagFilterField(model)
-class TenantFilterForm(CustomFieldModelFilterForm):
+class TenantFilterForm(ContactModelFilterForm, CustomFieldModelFilterForm):
model = Tenant
field_groups = (
('q', 'tag'),
('group_id',),
+ ('contact', 'contact_role')
)
group_id = DynamicModelMultipleChoiceField(
queryset=TenantGroup.objects.all(),
diff --git a/netbox/tenancy/forms/forms.py b/netbox/tenancy/forms/forms.py
index 9a3d00e05..5dcad1d43 100644
--- a/netbox/tenancy/forms/forms.py
+++ b/netbox/tenancy/forms/forms.py
@@ -1,10 +1,11 @@
from django import forms
from django.utils.translation import gettext as _
-from tenancy.models import Tenant, TenantGroup
+from tenancy.models import *
from utilities.forms import DynamicModelChoiceField, DynamicModelMultipleChoiceField
__all__ = (
+ 'ContactModelFilterForm',
'TenancyForm',
'TenancyFilterForm',
)
@@ -44,3 +45,16 @@ class TenancyFilterForm(forms.Form):
},
label=_('Tenant')
)
+
+
+class ContactModelFilterForm(forms.Form):
+ contact = DynamicModelMultipleChoiceField(
+ queryset=Contact.objects.all(),
+ required=False,
+ label=_('Contact')
+ )
+ contact_role = DynamicModelMultipleChoiceField(
+ queryset=ContactRole.objects.all(),
+ required=False,
+ label=_('Contact Role')
+ )
diff --git a/netbox/tenancy/models/contacts.py b/netbox/tenancy/models/contacts.py
index 42a7ffe7d..49e690fd3 100644
--- a/netbox/tenancy/models/contacts.py
+++ b/netbox/tenancy/models/contacts.py
@@ -166,3 +166,6 @@ class ContactAssignment(ChangeLoggedModel):
if self.priority:
return f"{self.contact} ({self.get_priority_display()})"
return str(self.contact)
+
+ def get_absolute_url(self):
+ return reverse('tenancy:contact', args=[self.contact.pk])
diff --git a/netbox/tenancy/tables.py b/netbox/tenancy/tables.py
index 11893481c..6b0d9fc9e 100644
--- a/netbox/tenancy/tables.py
+++ b/netbox/tenancy/tables.py
@@ -77,6 +77,9 @@ class TenantTable(BaseTable):
group = tables.Column(
linkify=True
)
+ contacts = tables.ManyToManyColumn(
+ linkify_item=True
+ )
comments = MarkdownColumn()
tags = TagColumn(
url_name='tenancy:tenant_list'
@@ -84,7 +87,7 @@ class TenantTable(BaseTable):
class Meta(BaseTable.Meta):
model = Tenant
- fields = ('pk', 'id', 'name', 'slug', 'group', 'description', 'comments', 'tags', 'created', 'last_updated',)
+ fields = ('pk', 'id', 'name', 'slug', 'group', 'description', 'comments', 'contacts', 'tags', 'created', 'last_updated',)
default_columns = ('pk', 'name', 'group', 'description')
diff --git a/netbox/utilities/templates/search/searchbar.html b/netbox/utilities/templates/search/searchbar.html
index d71fd8e69..74d12e9b9 100644
--- a/netbox/utilities/templates/search/searchbar.html
+++ b/netbox/utilities/templates/search/searchbar.html
@@ -5,7 +5,7 @@
aria-label="Search"
placeholder="Search"
class="form-control"
- value="{{ request.GET.q }}"
+ value="{{ request.GET.q|escape }}"
/>