-
- {% include 'extras/htmx/script_result.html' %}
+ {# Object list tab #}
+
+
+ {# Object table controls #}
+
+
+ {% if request.user.is_authenticated %}
+
+
+
+ {% endif %}
+
+
+
-
-
-
{{ script.filename }}
-
{{ script.source }}
-
+ {# /Object list tab #}
+
+ {# Filters tab #}
+ {% if filter_form %}
+
+ {% include 'inc/filter_list.html' %}
+
+ {% endif %}
+ {# /Filters tab #}
+
{% endblock content %}
{% block modals %}
- {% include 'inc/htmx_modal.html' %}
+ {% table_config_form table table_name="ObjectTable" %}
{% endblock modals %}
diff --git a/netbox/templates/inc/panels/image_attachments.html b/netbox/templates/inc/panels/image_attachments.html
index a5f2ac18f..c3c7cf7e3 100644
--- a/netbox/templates/inc/panels/image_attachments.html
+++ b/netbox/templates/inc/panels/image_attachments.html
@@ -6,7 +6,7 @@
{% trans "Images" %}
{% if perms.extras.add_imageattachment %}
diff --git a/netbox/templates/tenancy/object_contacts.html b/netbox/templates/tenancy/object_contacts.html
index 4b78e53d3..304972e4a 100644
--- a/netbox/templates/tenancy/object_contacts.html
+++ b/netbox/templates/tenancy/object_contacts.html
@@ -5,7 +5,7 @@
{% block extra_controls %}
{% if perms.tenancy.add_contactassignment %}
{% with viewname=object|viewname:"contacts" %}
-
+
{% trans "Add a contact" %}
{% endwith %}
diff --git a/netbox/tenancy/api/serializers_/contacts.py b/netbox/tenancy/api/serializers_/contacts.py
index 925e04cfd..38ffd2393 100644
--- a/netbox/tenancy/api/serializers_/contacts.py
+++ b/netbox/tenancy/api/serializers_/contacts.py
@@ -58,7 +58,7 @@ class ContactSerializer(NetBoxModelSerializer):
class ContactAssignmentSerializer(NetBoxModelSerializer):
url = serializers.HyperlinkedIdentityField(view_name='tenancy-api:contactassignment-detail')
- content_type = ContentTypeField(
+ object_type = ContentTypeField(
queryset=ContentType.objects.all()
)
object = serializers.SerializerMethodField(read_only=True)
@@ -69,13 +69,13 @@ class ContactAssignmentSerializer(NetBoxModelSerializer):
class Meta:
model = ContactAssignment
fields = [
- 'id', 'url', 'display', 'content_type', 'object_id', 'object', 'contact', 'role', 'priority', 'tags',
+ 'id', 'url', 'display', 'object_type', 'object_id', 'object', 'contact', 'role', 'priority', 'tags',
'custom_fields', 'created', 'last_updated',
]
brief_fields = ('id', 'url', 'display', 'contact', 'role', 'priority')
@extend_schema_field(OpenApiTypes.OBJECT)
def get_object(self, instance):
- serializer = get_serializer_for_model(instance.content_type.model_class())
+ serializer = get_serializer_for_model(instance.object_type.model_class())
context = {'request': self.context['request']}
return serializer(instance.object, nested=True, context=context).data
diff --git a/netbox/tenancy/filtersets.py b/netbox/tenancy/filtersets.py
index 8079b4035..7af3dc082 100644
--- a/netbox/tenancy/filtersets.py
+++ b/netbox/tenancy/filtersets.py
@@ -26,12 +26,25 @@ __all__ = (
class ContactGroupFilterSet(OrganizationalModelFilterSet):
parent_id = django_filters.ModelMultipleChoiceFilter(
queryset=ContactGroup.objects.all(),
- label=_('Contact group (ID)'),
+ label=_('Parent contact group (ID)'),
)
parent = django_filters.ModelMultipleChoiceFilter(
field_name='parent__slug',
queryset=ContactGroup.objects.all(),
to_field_name='slug',
+ label=_('Parent contact group (slug)'),
+ )
+ ancestor_id = TreeNodeMultipleChoiceFilter(
+ queryset=ContactGroup.objects.all(),
+ field_name='parent',
+ lookup_expr='in',
+ label=_('Contact group (ID)'),
+ )
+ ancestor = TreeNodeMultipleChoiceFilter(
+ queryset=ContactGroup.objects.all(),
+ field_name='parent',
+ lookup_expr='in',
+ to_field_name='slug',
label=_('Contact group (slug)'),
)
@@ -86,7 +99,7 @@ class ContactAssignmentFilterSet(NetBoxModelFilterSet):
method='search',
label=_('Search'),
)
- content_type = ContentTypeFilter()
+ object_type = ContentTypeFilter()
contact_id = django_filters.ModelMultipleChoiceFilter(
queryset=Contact.objects.all(),
label=_('Contact (ID)'),
@@ -118,7 +131,7 @@ class ContactAssignmentFilterSet(NetBoxModelFilterSet):
class Meta:
model = ContactAssignment
- fields = ['id', 'content_type_id', 'object_id', 'priority', 'tag']
+ fields = ['id', 'object_type_id', 'object_id', 'priority', 'tag']
def search(self, queryset, name, value):
if not value.strip():
@@ -155,12 +168,25 @@ class ContactModelFilterSet(django_filters.FilterSet):
class TenantGroupFilterSet(OrganizationalModelFilterSet):
parent_id = django_filters.ModelMultipleChoiceFilter(
queryset=TenantGroup.objects.all(),
- label=_('Tenant group (ID)'),
+ label=_('Parent tenant group (ID)'),
)
parent = django_filters.ModelMultipleChoiceFilter(
field_name='parent__slug',
queryset=TenantGroup.objects.all(),
to_field_name='slug',
+ label=_('Parent tenant group (slug)'),
+ )
+ ancestor_id = TreeNodeMultipleChoiceFilter(
+ queryset=TenantGroup.objects.all(),
+ field_name='parent',
+ lookup_expr='in',
+ label=_('Tenant group (ID)'),
+ )
+ ancestor = TreeNodeMultipleChoiceFilter(
+ queryset=TenantGroup.objects.all(),
+ field_name='parent',
+ lookup_expr='in',
+ to_field_name='slug',
label=_('Tenant group (slug)'),
)
diff --git a/netbox/tenancy/forms/bulk_import.py b/netbox/tenancy/forms/bulk_import.py
index f38b3293d..f37317549 100644
--- a/netbox/tenancy/forms/bulk_import.py
+++ b/netbox/tenancy/forms/bulk_import.py
@@ -91,7 +91,7 @@ class ContactImportForm(NetBoxModelImportForm):
class ContactAssignmentImportForm(NetBoxModelImportForm):
- content_type = CSVContentTypeField(
+ object_type = CSVContentTypeField(
queryset=ContentType.objects.all(),
help_text=_("One or more assigned object types")
)
@@ -108,4 +108,4 @@ class ContactAssignmentImportForm(NetBoxModelImportForm):
class Meta:
model = ContactAssignment
- fields = ('content_type', 'object_id', 'contact', 'priority', 'role')
+ fields = ('object_type', 'object_id', 'contact', 'priority', 'role')
diff --git a/netbox/tenancy/forms/filtersets.py b/netbox/tenancy/forms/filtersets.py
index 77e945542..fbd0f2ad0 100644
--- a/netbox/tenancy/forms/filtersets.py
+++ b/netbox/tenancy/forms/filtersets.py
@@ -1,7 +1,7 @@
from django import forms
from django.utils.translation import gettext_lazy as _
-from core.models import ContentType
+from core.models import ObjectType
from netbox.forms import NetBoxModelFilterSetForm
from tenancy.choices import *
from tenancy.models import *
@@ -83,10 +83,10 @@ class ContactAssignmentFilterForm(NetBoxModelFilterSetForm):
model = ContactAssignment
fieldsets = (
(None, ('q', 'filter_id', 'tag')),
- (_('Assignment'), ('content_type_id', 'group_id', 'contact_id', 'role_id', 'priority')),
+ (_('Assignment'), ('object_type_id', 'group_id', 'contact_id', 'role_id', 'priority')),
)
- content_type_id = ContentTypeMultipleChoiceField(
- queryset=ContentType.objects.with_feature('contacts'),
+ object_type_id = ContentTypeMultipleChoiceField(
+ queryset=ObjectType.objects.with_feature('contacts'),
required=False,
label=_('Object type')
)
diff --git a/netbox/tenancy/forms/model_forms.py b/netbox/tenancy/forms/model_forms.py
index 9a53eba17..140d9cf9a 100644
--- a/netbox/tenancy/forms/model_forms.py
+++ b/netbox/tenancy/forms/model_forms.py
@@ -143,9 +143,9 @@ class ContactAssignmentForm(NetBoxModelForm):
class Meta:
model = ContactAssignment
fields = (
- 'content_type', 'object_id', 'group', 'contact', 'role', 'priority', 'tags'
+ 'object_type', 'object_id', 'group', 'contact', 'role', 'priority', 'tags'
)
widgets = {
- 'content_type': forms.HiddenInput(),
+ 'object_type': forms.HiddenInput(),
'object_id': forms.HiddenInput(),
}
diff --git a/netbox/tenancy/migrations/0015_contactassignment_rename_content_type.py b/netbox/tenancy/migrations/0015_contactassignment_rename_content_type.py
new file mode 100644
index 000000000..58b14e10f
--- /dev/null
+++ b/netbox/tenancy/migrations/0015_contactassignment_rename_content_type.py
@@ -0,0 +1,40 @@
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('contenttypes', '0002_remove_content_type_name'),
+ ('extras', '0111_rename_content_types'),
+ ('tenancy', '0014_contactassignment_ordering'),
+ ]
+
+ operations = [
+ migrations.RemoveConstraint(
+ model_name='contactassignment',
+ name='tenancy_contactassignment_unique_object_contact_role',
+ ),
+ migrations.RemoveIndex(
+ model_name='contactassignment',
+ name='tenancy_con_content_693ff4_idx',
+ ),
+ migrations.RenameField(
+ model_name='contactassignment',
+ old_name='content_type',
+ new_name='object_type',
+ ),
+ migrations.AddIndex(
+ model_name='contactassignment',
+ index=models.Index(
+ fields=['object_type', 'object_id'],
+ name='tenancy_con_object__6f20f7_idx'
+ ),
+ ),
+ migrations.AddConstraint(
+ model_name='contactassignment',
+ constraint=models.UniqueConstraint(
+ fields=('object_type', 'object_id', 'contact', 'role'),
+ name='tenancy_contactassignment_unique_object_contact_role'
+ ),
+ ),
+ ]
diff --git a/netbox/tenancy/models/contacts.py b/netbox/tenancy/models/contacts.py
index 664fff098..e31330657 100644
--- a/netbox/tenancy/models/contacts.py
+++ b/netbox/tenancy/models/contacts.py
@@ -4,7 +4,7 @@ from django.db import models
from django.urls import reverse
from django.utils.translation import gettext_lazy as _
-from core.models import ContentType
+from core.models import ObjectType
from netbox.models import ChangeLoggedModel, NestedGroupModel, OrganizationalModel, PrimaryModel
from netbox.models.features import CustomFieldsMixin, ExportTemplatesMixin, TagsMixin
from tenancy.choices import *
@@ -111,13 +111,13 @@ class Contact(PrimaryModel):
class ContactAssignment(CustomFieldsMixin, ExportTemplatesMixin, TagsMixin, ChangeLoggedModel):
- content_type = models.ForeignKey(
+ object_type = models.ForeignKey(
to='contenttypes.ContentType',
on_delete=models.CASCADE
)
object_id = models.PositiveBigIntegerField()
object = GenericForeignKey(
- ct_field='content_type',
+ ct_field='object_type',
fk_field='object_id'
)
contact = models.ForeignKey(
@@ -137,16 +137,16 @@ class ContactAssignment(CustomFieldsMixin, ExportTemplatesMixin, TagsMixin, Chan
blank=True
)
- clone_fields = ('content_type', 'object_id', 'role', 'priority')
+ clone_fields = ('object_type', 'object_id', 'role', 'priority')
class Meta:
ordering = ('contact', 'priority', 'role', 'pk')
indexes = (
- models.Index(fields=('content_type', 'object_id')),
+ models.Index(fields=('object_type', 'object_id')),
)
constraints = (
models.UniqueConstraint(
- fields=('content_type', 'object_id', 'contact', 'role'),
+ fields=('object_type', 'object_id', 'contact', 'role'),
name='%(app_label)s_%(class)s_unique_object_contact_role'
),
)
@@ -165,9 +165,9 @@ class ContactAssignment(CustomFieldsMixin, ExportTemplatesMixin, TagsMixin, Chan
super().clean()
# Validate the assigned object type
- if self.content_type not in ContentType.objects.with_feature('contacts'):
+ if self.object_type not in ObjectType.objects.with_feature('contacts'):
raise ValidationError(
- _("Contacts cannot be assigned to this object type ({type}).").format(type=self.content_type)
+ _("Contacts cannot be assigned to this object type ({type}).").format(type=self.object_type)
)
def to_objectchange(self, action):
diff --git a/netbox/tenancy/tables/contacts.py b/netbox/tenancy/tables/contacts.py
index a22c04569..946058218 100644
--- a/netbox/tenancy/tables/contacts.py
+++ b/netbox/tenancy/tables/contacts.py
@@ -86,7 +86,7 @@ class ContactTable(NetBoxTable):
class ContactAssignmentTable(NetBoxTable):
- content_type = columns.ContentTypeColumn(
+ object_type = columns.ContentTypeColumn(
verbose_name=_('Object Type')
)
object = tables.Column(
@@ -141,10 +141,10 @@ class ContactAssignmentTable(NetBoxTable):
class Meta(NetBoxTable.Meta):
model = ContactAssignment
fields = (
- 'pk', 'content_type', 'object', 'contact', 'role', 'priority', 'contact_title', 'contact_phone',
+ 'pk', 'object_type', 'object', 'contact', 'role', 'priority', 'contact_title', 'contact_phone',
'contact_email', 'contact_address', 'contact_link', 'contact_description', 'contact_group', 'tags',
'actions'
)
default_columns = (
- 'pk', 'content_type', 'object', 'contact', 'role', 'priority', 'contact_email', 'contact_phone'
+ 'pk', 'object_type', 'object', 'contact', 'role', 'priority', 'contact_email', 'contact_phone'
)
diff --git a/netbox/tenancy/tests/test_api.py b/netbox/tenancy/tests/test_api.py
index 175bfa947..de6b36fc6 100644
--- a/netbox/tenancy/tests/test_api.py
+++ b/netbox/tenancy/tests/test_api.py
@@ -246,21 +246,21 @@ class ContactAssignmentTest(APIViewTestCases.APIViewTestCase):
cls.create_data = [
{
- 'content_type': 'dcim.site',
+ 'object_type': 'dcim.site',
'object_id': sites[1].pk,
'contact': contacts[3].pk,
'role': contact_roles[0].pk,
'priority': ContactPriorityChoices.PRIORITY_PRIMARY,
},
{
- 'content_type': 'dcim.site',
+ 'object_type': 'dcim.site',
'object_id': sites[1].pk,
'contact': contacts[4].pk,
'role': contact_roles[1].pk,
'priority': ContactPriorityChoices.PRIORITY_SECONDARY,
},
{
- 'content_type': 'dcim.site',
+ 'object_type': 'dcim.site',
'object_id': sites[1].pk,
'contact': contacts[5].pk,
'role': contact_roles[2].pk,
diff --git a/netbox/tenancy/tests/test_filtersets.py b/netbox/tenancy/tests/test_filtersets.py
index ab72bd39f..f6890a3d4 100644
--- a/netbox/tenancy/tests/test_filtersets.py
+++ b/netbox/tenancy/tests/test_filtersets.py
@@ -1,6 +1,6 @@
-from django.contrib.contenttypes.models import ContentType
from django.test import TestCase
+from core.models import ObjectType
from dcim.models import Manufacturer, Site
from tenancy.filtersets import *
from tenancy.models import *
@@ -15,35 +15,43 @@ class TenantGroupTestCase(TestCase, ChangeLoggedFilterSetTests):
def setUpTestData(cls):
parent_tenant_groups = (
- TenantGroup(name='Parent Tenant Group 1', slug='parent-tenant-group-1'),
- TenantGroup(name='Parent Tenant Group 2', slug='parent-tenant-group-2'),
- TenantGroup(name='Parent Tenant Group 3', slug='parent-tenant-group-3'),
+ TenantGroup(name='Tenant Group 1', slug='tenant-group-1'),
+ TenantGroup(name='Tenant Group 2', slug='tenant-group-2'),
+ TenantGroup(name='Tenant Group 3', slug='tenant-group-3'),
)
- for tenantgroup in parent_tenant_groups:
- tenantgroup.save()
+ for tenant_group in parent_tenant_groups:
+ tenant_group.save()
tenant_groups = (
TenantGroup(
- name='Tenant Group 1',
- slug='tenant-group-1',
+ name='Tenant Group 1A',
+ slug='tenant-group-1a',
parent=parent_tenant_groups[0],
description='foobar1'
),
TenantGroup(
- name='Tenant Group 2',
- slug='tenant-group-2',
+ name='Tenant Group 2A',
+ slug='tenant-group-2a',
parent=parent_tenant_groups[1],
description='foobar2'
),
TenantGroup(
- name='Tenant Group 3',
- slug='tenant-group-3',
+ name='Tenant Group 3A',
+ slug='tenant-group-3a',
parent=parent_tenant_groups[2],
description='foobar3'
),
)
- for tenantgroup in tenant_groups:
- tenantgroup.save()
+ for tenant_group in tenant_groups:
+ tenant_group.save()
+
+ child_tenant_groups = (
+ TenantGroup(name='Tenant Group 1A1', slug='tenant-group-1a1', parent=tenant_groups[0]),
+ TenantGroup(name='Tenant Group 2A1', slug='tenant-group-2a1', parent=tenant_groups[1]),
+ TenantGroup(name='Tenant Group 3A1', slug='tenant-group-3a1', parent=tenant_groups[2]),
+ )
+ for tenant_group in child_tenant_groups:
+ tenant_group.save()
def test_q(self):
params = {'q': 'foobar1'}
@@ -62,12 +70,19 @@ class TenantGroupTestCase(TestCase, ChangeLoggedFilterSetTests):
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
def test_parent(self):
- parent_groups = TenantGroup.objects.filter(name__startswith='Parent')[:2]
- params = {'parent_id': [parent_groups[0].pk, parent_groups[1].pk]}
+ tenant_groups = TenantGroup.objects.filter(parent__isnull=True)[:2]
+ params = {'parent_id': [tenant_groups[0].pk, tenant_groups[1].pk]}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
- params = {'parent': [parent_groups[0].slug, parent_groups[1].slug]}
+ params = {'parent': [tenant_groups[0].slug, tenant_groups[1].slug]}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+ def test_ancestor(self):
+ tenant_groups = TenantGroup.objects.filter(parent__isnull=True)[:2]
+ params = {'ancestor_id': [tenant_groups[0].pk, tenant_groups[1].pk]}
+ self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
+ params = {'ancestor': [tenant_groups[0].slug, tenant_groups[1].slug]}
+ self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
+
class TenantTestCase(TestCase, ChangeLoggedFilterSetTests):
queryset = Tenant.objects.all()
@@ -123,35 +138,43 @@ class ContactGroupTestCase(TestCase, ChangeLoggedFilterSetTests):
def setUpTestData(cls):
parent_contact_groups = (
- ContactGroup(name='Parent Contact Group 1', slug='parent-contact-group-1'),
- ContactGroup(name='Parent Contact Group 2', slug='parent-contact-group-2'),
- ContactGroup(name='Parent Contact Group 3', slug='parent-contact-group-3'),
+ ContactGroup(name='Contact Group 1', slug='contact-group-1'),
+ ContactGroup(name='Contact Group 2', slug='contact-group-2'),
+ ContactGroup(name='Contact Group 3', slug='contact-group-3'),
)
- for contactgroup in parent_contact_groups:
- contactgroup.save()
+ for contact_group in parent_contact_groups:
+ contact_group.save()
contact_groups = (
ContactGroup(
- name='Contact Group 1',
- slug='contact-group-1',
+ name='Contact Group 1A',
+ slug='contact-group-1a',
parent=parent_contact_groups[0],
description='foobar1'
),
ContactGroup(
- name='Contact Group 2',
- slug='contact-group-2',
+ name='Contact Group 2A',
+ slug='contact-group-2a',
parent=parent_contact_groups[1],
description='foobar2'
),
ContactGroup(
- name='Contact Group 3',
- slug='contact-group-3',
+ name='Contact Group 3A',
+ slug='contact-group-3a',
parent=parent_contact_groups[2],
description='foobar3'
),
)
- for contactgroup in contact_groups:
- contactgroup.save()
+ for contact_group in contact_groups:
+ contact_group.save()
+
+ child_contact_groups = (
+ ContactGroup(name='Contact Group 1A1', slug='contact-group-1a1', parent=contact_groups[0]),
+ ContactGroup(name='Contact Group 2A1', slug='contact-group-2a1', parent=contact_groups[1]),
+ ContactGroup(name='Contact Group 3A1', slug='contact-group-3a1', parent=contact_groups[2]),
+ )
+ for contact_group in child_contact_groups:
+ contact_group.save()
def test_q(self):
params = {'q': 'foobar1'}
@@ -170,12 +193,19 @@ class ContactGroupTestCase(TestCase, ChangeLoggedFilterSetTests):
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
def test_parent(self):
- parent_groups = ContactGroup.objects.filter(parent__isnull=True)[:2]
- params = {'parent_id': [parent_groups[0].pk, parent_groups[1].pk]}
+ contact_groups = ContactGroup.objects.filter(parent__isnull=True)[:2]
+ params = {'parent_id': [contact_groups[0].pk, contact_groups[1].pk]}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
- params = {'parent': [parent_groups[0].slug, parent_groups[1].slug]}
+ params = {'parent': [contact_groups[0].slug, contact_groups[1].slug]}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+ def test_ancestor(self):
+ contact_groups = ContactGroup.objects.filter(parent__isnull=True)[:2]
+ params = {'ancestor_id': [contact_groups[0].pk, contact_groups[1].pk]}
+ self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
+ params = {'ancestor': [contact_groups[0].slug, contact_groups[1].slug]}
+ self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
+
class ContactRoleTestCase(TestCase, ChangeLoggedFilterSetTests):
queryset = ContactRole.objects.all()
@@ -295,8 +325,8 @@ class ContactAssignmentTestCase(TestCase, ChangeLoggedFilterSetTests):
)
ContactAssignment.objects.bulk_create(assignments)
- def test_content_type(self):
- params = {'content_type_id': ContentType.objects.get_by_natural_key('dcim', 'site')}
+ def test_object_type(self):
+ params = {'object_type_id': ObjectType.objects.get_by_natural_key('dcim', 'site')}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3)
def test_contact(self):
diff --git a/netbox/tenancy/tests/test_views.py b/netbox/tenancy/tests/test_views.py
index 2151a6e8b..cbdecc0d0 100644
--- a/netbox/tenancy/tests/test_views.py
+++ b/netbox/tenancy/tests/test_views.py
@@ -292,7 +292,7 @@ class ContactAssignmentTestCase(
tags = create_tags('Alpha', 'Bravo', 'Charlie')
cls.form_data = {
- 'content_type': ContentType.objects.get_for_model(Site).pk,
+ 'object_type': ContentType.objects.get_for_model(Site).pk,
'object_id': sites[3].pk,
'contact': contacts[3].pk,
'role': contact_roles[3].pk,
@@ -306,11 +306,11 @@ class ContactAssignmentTestCase(
}
def _get_url(self, action, instance=None):
- # Override creation URL to append content_type & object_id parameters
+ # Override creation URL to append object_type & object_id parameters
if action == 'add':
url = reverse('tenancy:contactassignment_add')
content_type = ContentType.objects.get_for_model(Site).pk
object_id = Site.objects.first().pk
- return f"{url}?content_type={content_type}&object_id={object_id}"
+ return f"{url}?object_type={content_type}&object_id={object_id}"
return super()._get_url(action, instance=instance)
diff --git a/netbox/tenancy/views.py b/netbox/tenancy/views.py
index 1d2fceb04..4c4d263df 100644
--- a/netbox/tenancy/views.py
+++ b/netbox/tenancy/views.py
@@ -23,7 +23,7 @@ class ObjectContactsView(generic.ObjectChildrenView):
def get_children(self, request, parent):
return ContactAssignment.objects.restrict(request.user, 'view').filter(
- content_type=ContentType.objects.get_for_model(parent),
+ object_type=ContentType.objects.get_for_model(parent),
object_id=parent.pk
).order_by('priority', 'contact', 'role')
@@ -31,7 +31,7 @@ class ObjectContactsView(generic.ObjectChildrenView):
table = super().get_table(*args, **kwargs)
# Hide object columns
- table.columns.hide('content_type')
+ table.columns.hide('object_type')
table.columns.hide('object')
return table
@@ -374,8 +374,8 @@ class ContactAssignmentEditView(generic.ObjectEditView):
def alter_object(self, instance, request, args, kwargs):
if not instance.pk:
# Assign the object based on URL kwargs
- content_type = get_object_or_404(ContentType, pk=request.GET.get('content_type'))
- instance.object = get_object_or_404(content_type.model_class(), pk=request.GET.get('object_id'))
+ object_type = get_object_or_404(ContentType, pk=request.GET.get('object_type'))
+ instance.object = get_object_or_404(object_type.model_class(), pk=request.GET.get('object_id'))
return instance
def get_extra_addanother_params(self, request):
diff --git a/netbox/users/api/nested_serializers.py b/netbox/users/api/nested_serializers.py
index 552c24906..2ab5d3aa5 100644
--- a/netbox/users/api/nested_serializers.py
+++ b/netbox/users/api/nested_serializers.py
@@ -1,9 +1,9 @@
from django.contrib.auth import get_user_model
-from django.contrib.contenttypes.models import ContentType
from drf_spectacular.utils import extend_schema_field
from drf_spectacular.types import OpenApiTypes
from rest_framework import serializers
+from core.models import ObjectType
from netbox.api.fields import ContentTypeField
from netbox.api.serializers import WritableNestedSerializer
from users.models import Group, ObjectPermission, Token
@@ -49,7 +49,7 @@ class NestedTokenSerializer(WritableNestedSerializer):
class NestedObjectPermissionSerializer(WritableNestedSerializer):
url = serializers.HyperlinkedIdentityField(view_name='users-api:objectpermission-detail')
object_types = ContentTypeField(
- queryset=ContentType.objects.all(),
+ queryset=ObjectType.objects.all(),
many=True
)
groups = serializers.SerializerMethodField(read_only=True)
diff --git a/netbox/users/api/serializers_/permissions.py b/netbox/users/api/serializers_/permissions.py
index 6b0a6f6d9..ff5a1f212 100644
--- a/netbox/users/api/serializers_/permissions.py
+++ b/netbox/users/api/serializers_/permissions.py
@@ -1,7 +1,7 @@
from django.contrib.auth import get_user_model
-from django.contrib.contenttypes.models import ContentType
from rest_framework import serializers
+from core.models import ObjectType
from netbox.api.fields import ContentTypeField, SerializedPKRelatedField
from netbox.api.serializers import ValidatedModelSerializer
from users.models import Group, ObjectPermission
@@ -15,7 +15,7 @@ __all__ = (
class ObjectPermissionSerializer(ValidatedModelSerializer):
url = serializers.HyperlinkedIdentityField(view_name='users-api:objectpermission-detail')
object_types = ContentTypeField(
- queryset=ContentType.objects.all(),
+ queryset=ObjectType.objects.all(),
many=True
)
groups = SerializedPKRelatedField(
diff --git a/netbox/users/forms/model_forms.py b/netbox/users/forms/model_forms.py
index 2a024bf47..6c717d1ea 100644
--- a/netbox/users/forms/model_forms.py
+++ b/netbox/users/forms/model_forms.py
@@ -1,12 +1,12 @@
from django import forms
from django.conf import settings
from django.contrib.auth import get_user_model
-from django.contrib.contenttypes.models import ContentType
from django.contrib.postgres.forms import SimpleArrayField
from django.core.exceptions import FieldError
from django.utils.html import mark_safe
from django.utils.translation import gettext_lazy as _
+from core.models import ObjectType
from ipam.formfields import IPNetworkFormField
from ipam.validators import prefix_validator
from netbox.preferences import PREFERENCES
@@ -278,7 +278,7 @@ class GroupForm(forms.ModelForm):
class ObjectPermissionForm(forms.ModelForm):
object_types = ContentTypeMultipleChoiceField(
label=_('Object types'),
- queryset=ContentType.objects.all(),
+ queryset=ObjectType.objects.all(),
limit_choices_to=OBJECTPERMISSION_OBJECT_TYPES,
widget=forms.SelectMultiple(attrs={'size': 6})
)
diff --git a/netbox/users/migrations/0005_alter_user_table.py b/netbox/users/migrations/0005_alter_user_table.py
index e07db6875..22c6bdd42 100644
--- a/netbox/users/migrations/0005_alter_user_table.py
+++ b/netbox/users/migrations/0005_alter_user_table.py
@@ -14,7 +14,7 @@ def update_content_types(apps, schema_editor):
if netboxuser_ct:
user_ct = ContentType.objects.filter(app_label='users', model='user').first()
CustomField = apps.get_model('extras', 'CustomField')
- CustomField.objects.filter(object_type_id=netboxuser_ct.id).update(object_type_id=user_ct.id)
+ CustomField.objects.filter(related_object_type_id=netboxuser_ct.id).update(related_object_type_id=user_ct.id)
netboxuser_ct.delete()
diff --git a/netbox/users/migrations/0006_custom_group_model.py b/netbox/users/migrations/0006_custom_group_model.py
index 282da3ce0..04f4d0fd8 100644
--- a/netbox/users/migrations/0006_custom_group_model.py
+++ b/netbox/users/migrations/0006_custom_group_model.py
@@ -12,7 +12,7 @@ def update_custom_fields(apps, schema_editor):
if old_ct := ContentType.objects.filter(app_label='users', model='netboxgroup').first():
new_ct = ContentType.objects.get_for_model(Group)
- CustomField.objects.filter(object_type=old_ct).update(object_type=new_ct)
+ CustomField.objects.filter(related_object_type=old_ct).update(related_object_type=new_ct)
class Migration(migrations.Migration):
diff --git a/netbox/users/migrations/0007_objectpermission_update_object_types.py b/netbox/users/migrations/0007_objectpermission_update_object_types.py
new file mode 100644
index 000000000..d3018a602
--- /dev/null
+++ b/netbox/users/migrations/0007_objectpermission_update_object_types.py
@@ -0,0 +1,19 @@
+# Generated by Django 5.0.1 on 2024-03-04 14:33
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('core', '0010_gfk_indexes'),
+ ('users', '0006_custom_group_model'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='objectpermission',
+ name='object_types',
+ field=models.ManyToManyField(limit_choices_to=models.Q(models.Q(models.Q(('app_label__in', ['account', 'admin', 'auth', 'contenttypes', 'sessions', 'taggit', 'users']), _negated=True), models.Q(('app_label', 'auth'), ('model__in', ['group', 'user'])), models.Q(('app_label', 'users'), ('model__in', ['objectpermission', 'token'])), _connector='OR')), related_name='object_permissions', to='core.objecttype'),
+ ),
+ ]
diff --git a/netbox/users/models.py b/netbox/users/models.py
index 19d6013c7..d2ee16e5e 100644
--- a/netbox/users/models.py
+++ b/netbox/users/models.py
@@ -22,7 +22,7 @@ from django.utils import timezone
from django.utils.translation import gettext_lazy as _
from netaddr import IPNetwork
-from core.models import ContentType
+from core.models import ObjectType
from ipam.fields import IPNetworkField
from netbox.config import get_config
from utilities.querysets import RestrictedQuerySet
@@ -383,7 +383,7 @@ class ObjectPermission(models.Model):
default=True
)
object_types = models.ManyToManyField(
- to='contenttypes.ContentType',
+ to='core.ObjectType',
limit_choices_to=OBJECTPERMISSION_OBJECT_TYPES,
related_name='object_permissions'
)
diff --git a/netbox/users/tests/test_api.py b/netbox/users/tests/test_api.py
index 51fc21c97..2ff3545a6 100644
--- a/netbox/users/tests/test_api.py
+++ b/netbox/users/tests/test_api.py
@@ -1,7 +1,7 @@
from django.contrib.auth import get_user_model
-from django.contrib.contenttypes.models import ContentType
from django.urls import reverse
+from core.models import ObjectType
from users.models import Group, ObjectPermission, Token
from utilities.testing import APIViewTestCases, APITestCase, create_test_user
from utilities.utils import deepmerge
@@ -64,7 +64,7 @@ class UserTest(APIViewTestCases.APIViewTestCase):
)
obj_perm.save()
obj_perm.users.add(self.user)
- obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
+ obj_perm.object_types.add(ObjectType.objects.get_for_model(self.model))
user_credentials = {
'username': 'user1',
@@ -261,7 +261,7 @@ class ObjectPermissionTest(
)
User.objects.bulk_create(users)
- object_type = ContentType.objects.get(app_label='dcim', model='device')
+ object_type = ObjectType.objects.get(app_label='dcim', model='device')
for i in range(3):
objectpermission = ObjectPermission(
diff --git a/netbox/users/tests/test_filtersets.py b/netbox/users/tests/test_filtersets.py
index 5d373628f..5930285a9 100644
--- a/netbox/users/tests/test_filtersets.py
+++ b/netbox/users/tests/test_filtersets.py
@@ -1,10 +1,10 @@
import datetime
from django.contrib.auth import get_user_model
-from django.contrib.contenttypes.models import ContentType
from django.test import TestCase
from django.utils.timezone import make_aware
+from core.models import ObjectType
from users import filtersets
from users.models import Group, ObjectPermission, Token
from utilities.testing import BaseFilterSetTests
@@ -151,9 +151,9 @@ class ObjectPermissionTestCase(TestCase, BaseFilterSetTests):
User.objects.bulk_create(users)
object_types = (
- ContentType.objects.get(app_label='dcim', model='site'),
- ContentType.objects.get(app_label='dcim', model='rack'),
- ContentType.objects.get(app_label='dcim', model='device'),
+ ObjectType.objects.get(app_label='dcim', model='site'),
+ ObjectType.objects.get(app_label='dcim', model='rack'),
+ ObjectType.objects.get(app_label='dcim', model='device'),
)
permissions = (
@@ -198,7 +198,7 @@ class ObjectPermissionTestCase(TestCase, BaseFilterSetTests):
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
def test_object_types(self):
- object_types = ContentType.objects.filter(model__in=['site', 'rack'])
+ object_types = ObjectType.objects.filter(model__in=['site', 'rack'])
params = {'object_types': [object_types[0].pk, object_types[1].pk]}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
diff --git a/netbox/users/tests/test_views.py b/netbox/users/tests/test_views.py
index 27d2aeab1..588730dbd 100644
--- a/netbox/users/tests/test_views.py
+++ b/netbox/users/tests/test_views.py
@@ -1,5 +1,4 @@
-from django.contrib.contenttypes.models import ContentType
-
+from core.models import ObjectType
from users.models import *
from utilities.testing import ViewTestCases, create_test_user
@@ -115,7 +114,7 @@ class ObjectPermissionTestCase(
@classmethod
def setUpTestData(cls):
- ct = ContentType.objects.get_by_natural_key('dcim', 'site')
+ object_type = ObjectType.objects.get_by_natural_key('dcim', 'site')
permissions = (
ObjectPermission(name='Permission 1', actions=['view', 'add', 'delete']),
@@ -127,7 +126,7 @@ class ObjectPermissionTestCase(
cls.form_data = {
'name': 'Permission X',
'description': 'A new permission',
- 'object_types': [ct.pk],
+ 'object_types': [object_type.pk],
'actions': 'view,edit,delete',
}
diff --git a/netbox/utilities/permissions.py b/netbox/utilities/permissions.py
index c72a72db7..f4b7061ee 100644
--- a/netbox/utilities/permissions.py
+++ b/netbox/utilities/permissions.py
@@ -1,5 +1,4 @@
from django.conf import settings
-from django.contrib.contenttypes.models import ContentType
from django.db.models import Q
from django.utils.translation import gettext_lazy as _
@@ -50,13 +49,14 @@ def resolve_permission_ct(name):
:param name: Permission name in the format
._
"""
+ from core.models import ObjectType
app_label, action, model_name = resolve_permission(name)
try:
- content_type = ContentType.objects.get(app_label=app_label, model=model_name)
- except ContentType.DoesNotExist:
+ object_type = ObjectType.objects.get(app_label=app_label, model=model_name)
+ except ObjectType.DoesNotExist:
raise ValueError(_("Unknown app_label/model_name for {name}").format(name=name))
- return content_type, action
+ return object_type, action
def permission_is_exempt(name):
diff --git a/netbox/utilities/templates/buttons/export.html b/netbox/utilities/templates/buttons/export.html
index d24be88f7..2085356fa 100644
--- a/netbox/utilities/templates/buttons/export.html
+++ b/netbox/utilities/templates/buttons/export.html
@@ -25,7 +25,7 @@
- {% trans "Add export template" %}...
+ {% trans "Add export template" %}...
{% endif %}
diff --git a/netbox/utilities/templatetags/buttons.py b/netbox/utilities/templatetags/buttons.py
index 828af3b43..c0870d585 100644
--- a/netbox/utilities/templatetags/buttons.py
+++ b/netbox/utilities/templatetags/buttons.py
@@ -2,6 +2,7 @@ from django import template
from django.contrib.contenttypes.models import ContentType
from django.urls import NoReverseMatch, reverse
+from core.models import ObjectType
from extras.models import Bookmark, ExportTemplate
from utilities.utils import get_viewname, prepare_cloned_fields
@@ -132,18 +133,18 @@ def import_button(model, action='import'):
@register.inclusion_tag('buttons/export.html', takes_context=True)
def export_button(context, model):
- content_type = ContentType.objects.get_for_model(model)
+ object_type = ObjectType.objects.get_for_model(model)
user = context['request'].user
# Determine if the "all data" export returns CSV or YAML
- data_format = 'YAML' if hasattr(content_type.model_class(), 'to_yaml') else 'CSV'
+ data_format = 'YAML' if hasattr(object_type.model_class(), 'to_yaml') else 'CSV'
# Retrieve all export templates for this model
- export_templates = ExportTemplate.objects.restrict(user, 'view').filter(content_types=content_type)
+ export_templates = ExportTemplate.objects.restrict(user, 'view').filter(object_types=object_type)
return {
'perms': context['perms'],
- 'content_type': content_type,
+ 'object_type': object_type,
'url_params': context['request'].GET.urlencode() if context['request'].GET else '',
'export_templates': export_templates,
'data_format': data_format,
diff --git a/netbox/utilities/templatetags/helpers.py b/netbox/utilities/templatetags/helpers.py
index aaee9679c..b71848411 100644
--- a/netbox/utilities/templatetags/helpers.py
+++ b/netbox/utilities/templatetags/helpers.py
@@ -1,16 +1,16 @@
import datetime
import json
-from urllib.parse import quote
from typing import Dict, Any
+from urllib.parse import quote
from django import template
from django.conf import settings
-from django.contrib.contenttypes.models import ContentType
from django.template.defaultfilters import date
from django.urls import NoReverseMatch, reverse
from django.utils import timezone
from django.utils.safestring import mark_safe
+from core.models import ObjectType
from utilities.forms import get_selected_values, TableConfigForm
from utilities.utils import get_viewname
@@ -322,10 +322,10 @@ def applied_filters(context, model, form, query_params):
save_link = None
if user.has_perm('extras.add_savedfilter') and 'filter_id' not in context['request'].GET:
- content_type = ContentType.objects.get_for_model(model).pk
+ object_type = ObjectType.objects.get_for_model(model).pk
parameters = json.dumps(dict(context['request'].GET.lists()))
url = reverse('extras:savedfilter_add')
- save_link = f"{url}?content_types={content_type}¶meters={quote(parameters)}"
+ save_link = f"{url}?object_types={object_type}¶meters={quote(parameters)}"
return {
'applied_filters': applied_filters,
diff --git a/netbox/utilities/testing/api.py b/netbox/utilities/testing/api.py
index 6df317b49..50591a95f 100644
--- a/netbox/utilities/testing/api.py
+++ b/netbox/utilities/testing/api.py
@@ -10,6 +10,7 @@ from django.test import override_settings
from rest_framework import status
from rest_framework.test import APIClient
+from core.models import ObjectType
from extras.choices import ObjectChangeActionChoices
from extras.models import ObjectChange
from users.models import ObjectPermission, Token
@@ -112,7 +113,7 @@ class APIViewTestCases:
)
obj_perm.save()
obj_perm.users.add(self.user)
- obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
+ obj_perm.object_types.add(ObjectType.objects.get_for_model(self.model))
# Try GET to permitted object
url = self._get_detail_url(instance1)
@@ -186,7 +187,7 @@ class APIViewTestCases:
)
obj_perm.save()
obj_perm.users.add(self.user)
- obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
+ obj_perm.object_types.add(ObjectType.objects.get_for_model(self.model))
# Try GET to permitted objects
response = self.client.get(self._get_list_url(), **self.header)
@@ -227,7 +228,7 @@ class APIViewTestCases:
)
obj_perm.save()
obj_perm.users.add(self.user)
- obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
+ obj_perm.object_types.add(ObjectType.objects.get_for_model(self.model))
initial_count = self._get_queryset().count()
response = self.client.post(self._get_list_url(), self.create_data[0], format='json', **self.header)
@@ -261,7 +262,7 @@ class APIViewTestCases:
)
obj_perm.save()
obj_perm.users.add(self.user)
- obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
+ obj_perm.object_types.add(ObjectType.objects.get_for_model(self.model))
initial_count = self._get_queryset().count()
response = self.client.post(self._get_list_url(), self.create_data, format='json', **self.header)
@@ -312,7 +313,7 @@ class APIViewTestCases:
)
obj_perm.save()
obj_perm.users.add(self.user)
- obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
+ obj_perm.object_types.add(ObjectType.objects.get_for_model(self.model))
response = self.client.patch(url, update_data, format='json', **self.header)
self.assertHttpStatus(response, status.HTTP_200_OK)
@@ -347,7 +348,7 @@ class APIViewTestCases:
)
obj_perm.save()
obj_perm.users.add(self.user)
- obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
+ obj_perm.object_types.add(ObjectType.objects.get_for_model(self.model))
id_list = list(self._get_queryset().values_list('id', flat=True)[:3])
self.assertEqual(len(id_list), 3, "Insufficient number of objects to test bulk update")
@@ -390,7 +391,7 @@ class APIViewTestCases:
)
obj_perm.save()
obj_perm.users.add(self.user)
- obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
+ obj_perm.object_types.add(ObjectType.objects.get_for_model(self.model))
response = self.client.delete(url, **self.header)
self.assertHttpStatus(response, status.HTTP_204_NO_CONTENT)
@@ -416,7 +417,7 @@ class APIViewTestCases:
)
obj_perm.save()
obj_perm.users.add(self.user)
- obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
+ obj_perm.object_types.add(ObjectType.objects.get_for_model(self.model))
# Target the three most recently created objects to avoid triggering recursive deletions
# (e.g. with MPTT objects)
@@ -507,7 +508,7 @@ class APIViewTestCases:
)
obj_perm.save()
obj_perm.users.add(self.user)
- obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
+ obj_perm.object_types.add(ObjectType.objects.get_for_model(self.model))
response = self.client.post(url, data={'query': query}, format="json", **self.header)
self.assertHttpStatus(response, status.HTTP_200_OK)
@@ -532,7 +533,7 @@ class APIViewTestCases:
)
obj_perm.save()
obj_perm.users.add(self.user)
- obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
+ obj_perm.object_types.add(ObjectType.objects.get_for_model(self.model))
response = self.client.post(url, data={'query': query}, format="json", **self.header)
self.assertHttpStatus(response, status.HTTP_200_OK)
diff --git a/netbox/utilities/testing/base.py b/netbox/utilities/testing/base.py
index aa2093a9a..f16c2fbbd 100644
--- a/netbox/utilities/testing/base.py
+++ b/netbox/utilities/testing/base.py
@@ -10,6 +10,7 @@ from django.test import Client, TestCase as _TestCase
from netaddr import IPNetwork
from taggit.managers import TaggableManager
+from core.models import ObjectType
from users.models import ObjectPermission
from utilities.permissions import resolve_permission_ct
from utilities.utils import content_type_identifier
@@ -112,7 +113,7 @@ class ModelTestCase(TestCase):
# Handle ManyToManyFields
if value and type(field) in (ManyToManyField, TaggableManager):
- if field.related_model is ContentType and api:
+ if field.related_model in (ContentType, ObjectType) and api:
model_dict[key] = sorted([content_type_identifier(ct) for ct in value])
else:
model_dict[key] = sorted([obj.pk for obj in value])
@@ -120,8 +121,8 @@ class ModelTestCase(TestCase):
elif api:
# Replace ContentType numeric IDs with .
- if type(getattr(instance, key)) is ContentType:
- ct = ContentType.objects.get(pk=value)
+ if type(getattr(instance, key)) in (ContentType, ObjectType):
+ ct = ObjectType.objects.get(pk=value)
model_dict[key] = content_type_identifier(ct)
# Convert IPNetwork instances to strings
diff --git a/netbox/utilities/testing/views.py b/netbox/utilities/testing/views.py
index daa44b905..7bc776b1e 100644
--- a/netbox/utilities/testing/views.py
+++ b/netbox/utilities/testing/views.py
@@ -8,6 +8,7 @@ from django.test import override_settings
from django.urls import reverse
from django.utils.translation import gettext as _
+from core.models import ObjectType
from extras.choices import ObjectChangeActionChoices
from extras.models import ObjectChange
from netbox.models.features import ChangeLoggingMixin
@@ -93,7 +94,7 @@ class ViewTestCases:
)
obj_perm.save()
obj_perm.users.add(self.user)
- obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
+ obj_perm.object_types.add(ObjectType.objects.get_for_model(self.model))
# Try GET with model-level permission
self.assertHttpStatus(self.client.get(instance.get_absolute_url()), 200)
@@ -109,7 +110,7 @@ class ViewTestCases:
)
obj_perm.save()
obj_perm.users.add(self.user)
- obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
+ obj_perm.object_types.add(ObjectType.objects.get_for_model(self.model))
# Try GET to permitted object
self.assertHttpStatus(self.client.get(instance1.get_absolute_url()), 200)
@@ -161,7 +162,7 @@ class ViewTestCases:
)
obj_perm.save()
obj_perm.users.add(self.user)
- obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
+ obj_perm.object_types.add(ObjectType.objects.get_for_model(self.model))
# Try GET with model-level permission
self.assertHttpStatus(self.client.get(self._get_url('add')), 200)
@@ -197,7 +198,7 @@ class ViewTestCases:
)
obj_perm.save()
obj_perm.users.add(self.user)
- obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
+ obj_perm.object_types.add(ObjectType.objects.get_for_model(self.model))
# Try GET with object-level permission
self.assertHttpStatus(self.client.get(self._get_url('add')), 200)
@@ -260,7 +261,7 @@ class ViewTestCases:
)
obj_perm.save()
obj_perm.users.add(self.user)
- obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
+ obj_perm.object_types.add(ObjectType.objects.get_for_model(self.model))
# Try GET with model-level permission
self.assertHttpStatus(self.client.get(self._get_url('edit', instance)), 200)
@@ -295,7 +296,7 @@ class ViewTestCases:
)
obj_perm.save()
obj_perm.users.add(self.user)
- obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
+ obj_perm.object_types.add(ObjectType.objects.get_for_model(self.model))
# Try GET with a permitted object
self.assertHttpStatus(self.client.get(self._get_url('edit', instance1)), 200)
@@ -349,7 +350,7 @@ class ViewTestCases:
)
obj_perm.save()
obj_perm.users.add(self.user)
- obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
+ obj_perm.object_types.add(ObjectType.objects.get_for_model(self.model))
# Try GET with model-level permission
self.assertHttpStatus(self.client.get(self._get_url('delete', instance)), 200)
@@ -384,7 +385,7 @@ class ViewTestCases:
)
obj_perm.save()
obj_perm.users.add(self.user)
- obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
+ obj_perm.object_types.add(ObjectType.objects.get_for_model(self.model))
# Try GET with a permitted object
self.assertHttpStatus(self.client.get(self._get_url('delete', instance1)), 200)
@@ -442,7 +443,7 @@ class ViewTestCases:
)
obj_perm.save()
obj_perm.users.add(self.user)
- obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
+ obj_perm.object_types.add(ObjectType.objects.get_for_model(self.model))
# Try GET with model-level permission
self.assertHttpStatus(self.client.get(self._get_url('list')), 200)
@@ -458,7 +459,7 @@ class ViewTestCases:
)
obj_perm.save()
obj_perm.users.add(self.user)
- obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
+ obj_perm.object_types.add(ObjectType.objects.get_for_model(self.model))
# Try GET with object-level permission
response = self.client.get(self._get_url('list'))
@@ -477,7 +478,7 @@ class ViewTestCases:
)
obj_perm.save()
obj_perm.users.add(self.user)
- obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
+ obj_perm.object_types.add(ObjectType.objects.get_for_model(self.model))
# Test default CSV export
response = self.client.get(f'{url}?export')
@@ -524,7 +525,7 @@ class ViewTestCases:
)
obj_perm.save()
obj_perm.users.add(self.user)
- obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
+ obj_perm.object_types.add(ObjectType.objects.get_for_model(self.model))
# Bulk create objects
response = self.client.post(**request)
@@ -548,7 +549,7 @@ class ViewTestCases:
)
obj_perm.save()
obj_perm.users.add(self.user)
- obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
+ obj_perm.object_types.add(ObjectType.objects.get_for_model(self.model))
# Attempt to make the request with unmet constraints
self.assertHttpStatus(self.client.post(**request), 200)
@@ -610,7 +611,7 @@ class ViewTestCases:
)
obj_perm.save()
obj_perm.users.add(self.user)
- obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
+ obj_perm.object_types.add(ObjectType.objects.get_for_model(self.model))
# Try GET with model-level permission
self.assertHttpStatus(self.client.get(self._get_url('import')), 200)
@@ -639,7 +640,7 @@ class ViewTestCases:
)
obj_perm.save()
obj_perm.users.add(self.user)
- obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
+ obj_perm.object_types.add(ObjectType.objects.get_for_model(self.model))
# Test POST with permission
self.assertHttpStatus(self.client.post(self._get_url('import'), data), 302)
@@ -674,7 +675,7 @@ class ViewTestCases:
)
obj_perm.save()
obj_perm.users.add(self.user)
- obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
+ obj_perm.object_types.add(ObjectType.objects.get_for_model(self.model))
# Attempt to import non-permitted objects
self.assertHttpStatus(self.client.post(self._get_url('import'), data), 200)
@@ -730,7 +731,7 @@ class ViewTestCases:
)
obj_perm.save()
obj_perm.users.add(self.user)
- obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
+ obj_perm.object_types.add(ObjectType.objects.get_for_model(self.model))
# Try POST with model-level permission
self.assertHttpStatus(self.client.post(self._get_url('bulk_edit'), data), 302)
@@ -761,7 +762,7 @@ class ViewTestCases:
)
obj_perm.save()
obj_perm.users.add(self.user)
- obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
+ obj_perm.object_types.add(ObjectType.objects.get_for_model(self.model))
# Attempt to bulk edit permitted objects into a non-permitted state
response = self.client.post(self._get_url('bulk_edit'), data)
@@ -811,7 +812,7 @@ class ViewTestCases:
)
obj_perm.save()
obj_perm.users.add(self.user)
- obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
+ obj_perm.object_types.add(ObjectType.objects.get_for_model(self.model))
# Try POST with model-level permission
self.assertHttpStatus(self.client.post(self._get_url('bulk_delete'), data), 302)
@@ -833,7 +834,7 @@ class ViewTestCases:
)
obj_perm.save()
obj_perm.users.add(self.user)
- obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
+ obj_perm.object_types.add(ObjectType.objects.get_for_model(self.model))
# Attempt to bulk delete non-permitted objects
initial_count = self._get_queryset().count()
@@ -891,7 +892,7 @@ class ViewTestCases:
)
obj_perm.save()
obj_perm.users.add(self.user)
- obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
+ obj_perm.object_types.add(ObjectType.objects.get_for_model(self.model))
# Try POST with model-level permission
self.assertHttpStatus(self.client.post(self._get_url('bulk_rename'), data), 302)
@@ -916,7 +917,7 @@ class ViewTestCases:
)
obj_perm.save()
obj_perm.users.add(self.user)
- obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
+ obj_perm.object_types.add(ObjectType.objects.get_for_model(self.model))
# Attempt to bulk edit permitted objects into a non-permitted state
response = self.client.post(self._get_url('bulk_rename'), data)
diff --git a/netbox/utilities/tests/test_api.py b/netbox/utilities/tests/test_api.py
index 1cc3487b1..81be70a34 100644
--- a/netbox/utilities/tests/test_api.py
+++ b/netbox/utilities/tests/test_api.py
@@ -1,10 +1,8 @@
-import urllib.parse
-
-from django.contrib.contenttypes.models import ContentType
from django.test import Client, TestCase, override_settings
from django.urls import reverse
from rest_framework import status
+from core.models import ObjectType
from dcim.models import Region, Site
from extras.choices import CustomFieldTypeChoices
from extras.models import CustomField
@@ -240,10 +238,10 @@ class APIDocsTestCase(TestCase):
self.client = Client()
# Populate a CustomField to activate CustomFieldSerializer
- content_type = ContentType.objects.get_for_model(Site)
+ object_type = ObjectType.objects.get_for_model(Site)
self.cf_text = CustomField(type=CustomFieldTypeChoices.TYPE_TEXT, name='test')
self.cf_text.save()
- self.cf_text.content_types.set([content_type])
+ self.cf_text.object_types.set([object_type])
self.cf_text.save()
def test_api_docs(self):
diff --git a/netbox/utilities/tests/test_counters.py b/netbox/utilities/tests/test_counters.py
index 014c758e9..b87e73ace 100644
--- a/netbox/utilities/tests/test_counters.py
+++ b/netbox/utilities/tests/test_counters.py
@@ -1,11 +1,9 @@
-from django.contrib.contenttypes.models import ContentType
from django.test import override_settings
from django.urls import reverse
from dcim.models import *
-from users.models import ObjectPermission
from utilities.testing.base import TestCase
-from utilities.testing.utils import create_test_device, create_test_user
+from utilities.testing.utils import create_test_device
class CountersTest(TestCase):
diff --git a/netbox/vpn/migrations/0005_rename_indexes.py b/netbox/vpn/migrations/0005_rename_indexes.py
new file mode 100644
index 000000000..805b380cc
--- /dev/null
+++ b/netbox/vpn/migrations/0005_rename_indexes.py
@@ -0,0 +1,44 @@
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('vpn', '0004_alter_ikepolicy_mode'),
+ ]
+
+ operations = [
+
+ # Rename vpn_l2vpn constraints
+ migrations.RunSQL("ALTER TABLE vpn_l2vpn RENAME CONSTRAINT ipam_l2vpn_tenant_id_bb2564a6_fk_tenancy_tenant_id TO vpn_l2vpn_tenant_id_57ec8f92_fk_tenancy_tenant_id"),
+
+ # Rename ipam_l2vpn_* sequences
+ migrations.RunSQL("ALTER TABLE ipam_l2vpn_export_targets_id_seq RENAME TO vpn_l2vpn_export_targets_id_seq"),
+ migrations.RunSQL("ALTER TABLE ipam_l2vpn_id_seq RENAME TO vpn_l2vpn_id_seq"),
+ migrations.RunSQL("ALTER TABLE ipam_l2vpn_import_targets_id_seq RENAME TO vpn_l2vpn_import_targets_id_seq"),
+
+ # Rename ipam_l2vpn_* indexes
+ migrations.RunSQL("ALTER INDEX ipam_l2vpn_pkey RENAME TO vpn_l2vpn_pkey"),
+ migrations.RunSQL("ALTER INDEX ipam_l2vpn_name_5e1c080f_like RENAME TO vpn_l2vpn_name_8824eda5_like"),
+ migrations.RunSQL("ALTER INDEX ipam_l2vpn_name_key RENAME TO vpn_l2vpn_name_key"),
+ migrations.RunSQL("ALTER INDEX ipam_l2vpn_slug_24008406_like RENAME TO vpn_l2vpn_slug_76b5a174_like"),
+ migrations.RunSQL("ALTER INDEX ipam_l2vpn_tenant_id_bb2564a6 RENAME TO vpn_l2vpn_tenant_id_57ec8f92"),
+ # The unique index for L2VPN.slug may have one of two names, depending on how it was created,
+ # so we check for both.
+ migrations.RunSQL("ALTER INDEX IF EXISTS ipam_l2vpn_slug_24008406_uniq RENAME TO vpn_l2vpn_slug_76b5a174_uniq"),
+ migrations.RunSQL("ALTER INDEX IF EXISTS ipam_l2vpn_slug_key RENAME TO vpn_l2vpn_slug_key"),
+
+ # Rename vpn_l2vpntermination constraints
+ migrations.RunSQL("ALTER TABLE vpn_l2vpntermination RENAME CONSTRAINT ipam_l2vpntermination_assigned_object_id_check TO vpn_l2vpntermination_assigned_object_id_check"),
+ migrations.RunSQL("ALTER TABLE vpn_l2vpntermination RENAME CONSTRAINT ipam_l2vpnterminatio_assigned_object_type_3923c124_fk_django_co TO vpn_l2vpntermination_assigned_object_type_id_f063b865_fk_django_co"),
+ migrations.RunSQL("ALTER TABLE vpn_l2vpntermination RENAME CONSTRAINT ipam_l2vpntermination_l2vpn_id_9e570aa1_fk_ipam_l2vpn_id TO vpn_l2vpntermination_l2vpn_id_f5367bbe_fk_vpn_l2vpn_id"),
+
+ # Rename ipam_l2vpn_termination_* sequences
+ migrations.RunSQL("ALTER TABLE ipam_l2vpntermination_id_seq RENAME TO vpn_l2vpntermination_id_seq"),
+
+ # Rename ipam_l2vpn_* indexes
+ migrations.RunSQL("ALTER INDEX ipam_l2vpntermination_pkey RENAME TO vpn_l2vpntermination_pkey"),
+ migrations.RunSQL("ALTER INDEX ipam_l2vpntermination_assigned_object_type_id_3923c124 RENAME TO vpn_l2vpntermination_assigned_object_type_id_f063b865"),
+ migrations.RunSQL("ALTER INDEX ipam_l2vpntermination_l2vpn_id_9e570aa1 RENAME TO vpn_l2vpntermination_l2vpn_id_f5367bbe"),
+
+ ]
diff --git a/netbox/vpn/models/l2vpn.py b/netbox/vpn/models/l2vpn.py
index 31d267113..39956edc8 100644
--- a/netbox/vpn/models/l2vpn.py
+++ b/netbox/vpn/models/l2vpn.py
@@ -5,7 +5,7 @@ from django.urls import reverse
from django.utils.functional import cached_property
from django.utils.translation import gettext_lazy as _
-from core.models import ContentType
+from core.models import ObjectType
from netbox.models import NetBoxModel, PrimaryModel
from netbox.models.features import ContactsMixin
from vpn.choices import L2VPNTypeChoices
@@ -128,7 +128,7 @@ class L2VPNTermination(NetBoxModel):
# Only check is assigned_object is set. Required otherwise we have an Integrity Error thrown.
if self.assigned_object:
obj_id = self.assigned_object.pk
- obj_type = ContentType.objects.get_for_model(self.assigned_object)
+ obj_type = ObjectType.objects.get_for_model(self.assigned_object)
if L2VPNTermination.objects.filter(assigned_object_id=obj_id, assigned_object_type=obj_type).\
exclude(pk=self.pk).count() > 0:
raise ValidationError(
@@ -150,7 +150,7 @@ class L2VPNTermination(NetBoxModel):
@property
def assigned_object_parent(self):
- obj_type = ContentType.objects.get_for_model(self.assigned_object)
+ obj_type = ObjectType.objects.get_for_model(self.assigned_object)
if obj_type.model == 'vminterface':
return self.assigned_object.virtual_machine
elif obj_type.model == 'interface':
diff --git a/netbox/wireless/filtersets.py b/netbox/wireless/filtersets.py
index 6ffb9cb91..50b1f78b1 100644
--- a/netbox/wireless/filtersets.py
+++ b/netbox/wireless/filtersets.py
@@ -25,6 +25,17 @@ class WirelessLANGroupFilterSet(OrganizationalModelFilterSet):
queryset=WirelessLANGroup.objects.all(),
to_field_name='slug'
)
+ ancestor_id = TreeNodeMultipleChoiceFilter(
+ queryset=WirelessLANGroup.objects.all(),
+ field_name='parent',
+ lookup_expr='in'
+ )
+ ancestor = TreeNodeMultipleChoiceFilter(
+ queryset=WirelessLANGroup.objects.all(),
+ field_name='parent',
+ lookup_expr='in',
+ to_field_name='slug'
+ )
class Meta:
model = WirelessLANGroup
diff --git a/netbox/wireless/tests/test_filtersets.py b/netbox/wireless/tests/test_filtersets.py
index 4184d5392..78e50edb7 100644
--- a/netbox/wireless/tests/test_filtersets.py
+++ b/netbox/wireless/tests/test_filtersets.py
@@ -17,21 +17,32 @@ class WirelessLANGroupTestCase(TestCase, ChangeLoggedFilterSetTests):
@classmethod
def setUpTestData(cls):
- groups = (
+ parent_groups = (
WirelessLANGroup(name='Wireless LAN Group 1', slug='wireless-lan-group-1', description='A'),
WirelessLANGroup(name='Wireless LAN Group 2', slug='wireless-lan-group-2', description='B'),
WirelessLANGroup(name='Wireless LAN Group 3', slug='wireless-lan-group-3', description='C'),
)
+ for group in parent_groups:
+ group.save()
+
+ groups = (
+ WirelessLANGroup(name='Wireless LAN Group 1A', slug='wireless-lan-group-1a', parent=parent_groups[0], description='foobar1'),
+ WirelessLANGroup(name='Wireless LAN Group 1B', slug='wireless-lan-group-1b', parent=parent_groups[0], description='foobar2'),
+ WirelessLANGroup(name='Wireless LAN Group 2A', slug='wireless-lan-group-2a', parent=parent_groups[1]),
+ WirelessLANGroup(name='Wireless LAN Group 2B', slug='wireless-lan-group-2b', parent=parent_groups[1]),
+ WirelessLANGroup(name='Wireless LAN Group 3A', slug='wireless-lan-group-3a', parent=parent_groups[2]),
+ WirelessLANGroup(name='Wireless LAN Group 3B', slug='wireless-lan-group-3b', parent=parent_groups[2]),
+ )
for group in groups:
group.save()
child_groups = (
- WirelessLANGroup(name='Wireless LAN Group 1A', slug='wireless-lan-group-1a', parent=groups[0], description='foobar1'),
- WirelessLANGroup(name='Wireless LAN Group 1B', slug='wireless-lan-group-1b', parent=groups[0], description='foobar2'),
- WirelessLANGroup(name='Wireless LAN Group 2A', slug='wireless-lan-group-2a', parent=groups[1]),
- WirelessLANGroup(name='Wireless LAN Group 2B', slug='wireless-lan-group-2b', parent=groups[1]),
- WirelessLANGroup(name='Wireless LAN Group 3A', slug='wireless-lan-group-3a', parent=groups[2]),
- WirelessLANGroup(name='Wireless LAN Group 3B', slug='wireless-lan-group-3b', parent=groups[2]),
+ WirelessLANGroup(name='Wireless LAN Group 1A1', slug='wireless-lan-group-1a1', parent=groups[0]),
+ WirelessLANGroup(name='Wireless LAN Group 1B1', slug='wireless-lan-group-1b1', parent=groups[1]),
+ WirelessLANGroup(name='Wireless LAN Group 2A1', slug='wireless-lan-group-2a1', parent=groups[2]),
+ WirelessLANGroup(name='Wireless LAN Group 2B1', slug='wireless-lan-group-2b1', parent=groups[3]),
+ WirelessLANGroup(name='Wireless LAN Group 3A1', slug='wireless-lan-group-3a1', parent=groups[4]),
+ WirelessLANGroup(name='Wireless LAN Group 3B1', slug='wireless-lan-group-3b1', parent=groups[5]),
)
for group in child_groups:
group.save()
@@ -48,17 +59,24 @@ class WirelessLANGroupTestCase(TestCase, ChangeLoggedFilterSetTests):
params = {'slug': ['wireless-lan-group-1', 'wireless-lan-group-2']}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
- def test_parent(self):
- parent_groups = WirelessLANGroup.objects.filter(parent__isnull=True)[:2]
- params = {'parent_id': [parent_groups[0].pk, parent_groups[1].pk]}
- self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
- params = {'parent': [parent_groups[0].slug, parent_groups[1].slug]}
- self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
-
def test_description(self):
params = {'description': ['foobar1', 'foobar2']}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+ def test_parent(self):
+ groups = WirelessLANGroup.objects.filter(parent__isnull=True)[:2]
+ params = {'parent_id': [groups[0].pk, groups[1].pk]}
+ self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
+ params = {'parent': [groups[0].slug, groups[1].slug]}
+ self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
+
+ def test_ancestor(self):
+ groups = WirelessLANGroup.objects.filter(parent__isnull=True)[:2]
+ params = {'ancestor_id': [groups[0].pk, groups[1].pk]}
+ self.assertEqual(self.filterset(params, self.queryset).qs.count(), 8)
+ params = {'ancestor': [groups[0].slug, groups[1].slug]}
+ self.assertEqual(self.filterset(params, self.queryset).qs.count(), 8)
+
class WirelessLANTestCase(TestCase, ChangeLoggedFilterSetTests):
queryset = WirelessLAN.objects.all()