Make url a property on MenuItem/PluginMenuItem etc, overridable via a setter

Back out support for callables but keep alternate prerendered url param
Merge branch 'main' into nav-menu-callables
2026-01-10 22:02:17 -06:00 · 2025-07-13 20:19:46 -04:00 · 2025-07-08 15:38:12 -04:00 · 2025-07-08 15:32:38 -04:00 · 2025-07-07 19:30:03 -04:00 · 2025-06-30 14:26:43 -04:00
94 changed files with 8162 additions and 10179 deletions
--- a/.github/ISSUE_TEMPLATE/01-feature_request.yaml
+++ b/.github/ISSUE_TEMPLATE/01-feature_request.yaml
@@ -15,7 +15,7 @@ body:
    attributes:
      label: NetBox version
      description: What version of NetBox are you currently running?
-      placeholder: v4.3.5
+      placeholder: v4.3.3
    validations:
      required: true
  - type: dropdown
--- a/.github/ISSUE_TEMPLATE/02-bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/02-bug_report.yaml
@@ -27,7 +27,7 @@ body:
    attributes:
      label: NetBox Version
      description: What version of NetBox are you currently running?
-      placeholder: v4.3.5
+      placeholder: v4.3.3
    validations:
      required: true
  - type: dropdown
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
  <a href="https://github.com/netbox-community/netbox/graphs/contributors"><img src="https://img.shields.io/github/contributors/netbox-community/netbox?color=blue" alt="Contributors" /></a>
  <a href="https://github.com/netbox-community/netbox/stargazers"><img src="https://img.shields.io/github/stars/netbox-community/netbox?style=flat" alt="GitHub stars" /></a>
  <a href="https://explore.transifex.com/netbox-community/netbox/"><img src="https://img.shields.io/badge/languages-15-blue" alt="Languages supported" /></a>
-  <a href="https://github.com/netbox-community/netbox/actions/workflows/ci.yml"><img src="https://github.com/netbox-community/netbox/actions/workflows/ci.yml/badge.svg" alt="CI status" /></a>
+  <a href="https://github.com/netbox-community/netbox/actions/workflows/ci.yml"><img src="https://github.com/netbox-community/netbox/workflows/CI/badge.svg?branch=main" alt="CI status" /></a>
  <p>
    <strong><a href="https://netboxlabs.com/community/">NetBox Community</a></strong> |
    <strong><a href="https://netboxlabs.com/netbox-cloud/">NetBox Cloud</a></strong> |
--- a/base_requirements.txt
+++ b/base_requirements.txt
@@ -8,18 +8,12 @@ django-cors-headers

 # Runtime UI tool for debugging Django
 # https://github.com/jazzband/django-debug-toolbar/blob/main/docs/changes.rst
-# django-debug-toolbar v6.0.0 raises "Attribute Error at /: 'function' object has no attribute 'set'" 
-# see https://github.com/netbox-community/netbox/issues/19974
-django-debug-toolbar==5.2.0
+django-debug-toolbar

 # Library for writing reusable URL query filters
 # https://github.com/carltongibson/django-filter/blob/main/CHANGES.rst
 django-filter

-# Django Debug Toolbar extension for GraphiQL
-# https://github.com/flavors/django-graphiql-debug-toolbar/blob/main/CHANGES.rst
-django-graphiql-debug-toolbar
-
 # HTMX utilities for Django
 # https://django-htmx.readthedocs.io/en/latest/changelog.html
 django-htmx
@@ -114,7 +108,6 @@ nh3

 # Fork of PIL (Python Imaging Library) for image processing
 # https://github.com/python-pillow/Pillow/releases
-# https://pillow.readthedocs.io/en/stable/releasenotes/
 Pillow

 # PostgreSQL database adapter for Python
@@ -133,21 +126,22 @@ requests
 # https://github.com/rq/rq/blob/master/CHANGES.md
 rq

-# Django app for social-auth-core
-# https://github.com/python-social-auth/social-app-django/blob/master/CHANGELOG.md
-social-auth-app-django
-
 # Social authentication framework
 # https://github.com/python-social-auth/social-core/blob/master/CHANGELOG.md
 social-auth-core

+# Django app for social-auth-core
+# https://github.com/python-social-auth/social-app-django/blob/master/CHANGELOG.md
+social-auth-app-django
+
 # Strawberry GraphQL
 # https://github.com/strawberry-graphql/strawberry/blob/main/CHANGELOG.md
 strawberry-graphql

 # Strawberry GraphQL Django extension
 # https://github.com/strawberry-graphql/strawberry-django/releases
-strawberry-graphql-django
+# See #19771
+strawberry-graphql-django==0.60.0

 # SVG image rendering (used for rack elevations)
 # https://github.com/mozman/svgwrite/blob/master/NEWS.rst
--- a/docs/administration/replicating-netbox.md
+++ b/docs/administration/replicating-netbox.md
@@ -18,10 +18,10 @@ pg_dump --username netbox --password --host localhost netbox > netbox.sql
 !!! note
    You may need to change the username, host, and/or database in the command above to match your installation.

-When replicating a production database for development purposes, you may find it convenient to exclude changelog data, which can easily account for the bulk of a database's size. To do this, exclude the `core_objectchange` table data from the export. The table will still be included in the output file, but will not be populated with any data.
+When replicating a production database for development purposes, you may find it convenient to exclude changelog data, which can easily account for the bulk of a database's size. To do this, exclude the `extras_objectchange` table data from the export. The table will still be included in the output file, but will not be populated with any data.

 ```no-highlight
-pg_dump ... --exclude-table-data=core_objectchange netbox > netbox.sql
+pg_dump ... --exclude-table-data=extras_objectchange netbox > netbox.sql
 ```

 ### Load an Exported Database
--- a/docs/configuration/system.md
+++ b/docs/configuration/system.md
@@ -158,7 +158,6 @@ LOGGING = {
 * `netbox.<app>.<model>` - Generic form for model-specific log messages
 * `netbox.auth.*` - Authentication events
 * `netbox.api.views.*` - Views which handle business logic for the REST API
-* `netbox.event_rules` - Event rules
 * `netbox.reports.*` - Report execution (`module.name`)
 * `netbox.scripts.*` - Custom script execution (`module.name`)
 * `netbox.views.*` - Views which handle business logic for the web UI
--- a/docs/development/getting-started.md
+++ b/docs/development/getting-started.md
@@ -147,7 +147,7 @@ For UI development you will need to review the [Web UI Development Guide](web-ui

 ## Populating Demo Data

-Once you have your development environment up and running, it might be helpful to populate some "dummy" data to make interacting with the UI and APIs more convenient. Check out the [netbox-demo-data](https://github.com/netbox-community/netbox-demo-data) repo on GitHub, which houses a collection of sample data that can be easily imported to any new NetBox deployment. This sample data is used to populate the [public demo instance](https://demo.netbox.dev).
+Once you have your development environment up and running, it might be helpful to populate some "dummy" data to make interacting with the UI and APIs more convenient. Check out the [netbox-demo-data](https://github.com/netbox-community/netbox-demo-data) repo on GitHub, which houses a collection of sample data that can be easily imported to any new NetBox deployment. (This sample data is used to populate the public demo instance at <https://demo.netbox.dev>.)

 The demo data is provided in JSON format and loaded into an empty database using Django's `loaddata` management command. Consult the demo data repo's `README` file for complete instructions on populating the data.

--- a/docs/installation/3-netbox.md
+++ b/docs/installation/3-netbox.md
@@ -302,6 +302,13 @@ Quit the server with CONTROL-C.

 Next, connect to the name or IP of the server (as defined in `ALLOWED_HOSTS`) on port 8000; for example, <http://127.0.0.1:8000/>. You should be greeted with the NetBox home page. Try logging in using the username and password specified when creating a superuser.

+!!! note
+    By default RHEL based distros will likely block your testing attempts with firewalld. The development server port can be opened with `firewall-cmd` (add `--permanent` if you want the rule to survive server restarts):
+
+    ```no-highlight
+    firewall-cmd --zone=public --add-port=8000/tcp
+    ```
+
 !!! danger "Not for production use"
    The development server is for development and testing purposes only. It is neither performant nor secure enough for production use. **Do not use it in production.**

--- a/docs/media/installation/upgrade_paths.png
+++ b/docs/media/installation/upgrade_paths.png
--- a/docs/models/extras/configtemplate.md
+++ b/docs/models/extras/configtemplate.md
@@ -24,14 +24,6 @@ Jinja2 template code, if being defined locally rather than replicated from a dat

 A dictionary of any additional parameters to pass when instantiating the [Jinja2 environment](https://jinja.palletsprojects.com/en/3.1.x/api/#jinja2.Environment). Jinja2 supports various optional parameters which can be used to modify its default behavior.

-The `undefined` and `finalize` Jinja environment parameters, which must reference a Python class or function, can define a dotted path to the desired resource. For example:
-
-```json
-{
-    "undefined": "jinja2.StrictUndefined"
-}
-```
-
 ### MIME Type

 !!! info "This field was introduced in NetBox v4.3."
--- a/docs/models/extras/exporttemplate.md
+++ b/docs/models/extras/exporttemplate.md
@@ -26,14 +26,6 @@ Jinja2 template code for rendering the exported data.

 A dictionary of any additional parameters to pass when instantiating the [Jinja2 environment](https://jinja.palletsprojects.com/en/3.1.x/api/#jinja2.Environment). Jinja2 supports various optional parameters which can be used to modify its default behavior.

-The `undefined` and `finalize` Jinja environment parameters, which must reference a Python class or function, can define a dotted path to the desired resource. For example:
-
-```json
-{
-    "undefined": "jinja2.StrictUndefined"
-}
-```
-
 ### MIME Type

 The MIME type to indicate in the response when rendering the export template (optional). Defaults to `text/plain`.
--- a/docs/reference/filtering.md
+++ b/docs/reference/filtering.md
@@ -80,20 +80,18 @@ GET /api/ipam/vlans/?vid__gt=900

 String based (char) fields (Name, Address, etc) support these lookup expressions:

-| Filter   | Description                            |
-|----------|----------------------------------------|
-| `n`      | Not equal to                           |
-| `ic`     | Contains (case-insensitive)            |
-| `nic`    | Does not contain (case-insensitive)    |
-| `isw`    | Starts with (case-insensitive)         |
-| `nisw`   | Does not start with (case-insensitive) |
-| `iew`    | Ends with (case-insensitive)           |
-| `niew`   | Does not end with (case-insensitive)   |
-| `ie`     | Exact match (case-insensitive)         |
-| `nie`    | Inverse exact match (case-insensitive) |
-| `empty`  | Is empty/null (boolean)                |
-| `regex`  | Regexp matching                        |
-| `iregex` | Regexp matching (case-insensitive)     |
+| Filter  | Description                            |
+|---------|----------------------------------------|
+| `n`     | Not equal to                           |
+| `ic`    | Contains (case-insensitive)            |
+| `nic`   | Does not contain (case-insensitive)    |
+| `isw`   | Starts with (case-insensitive)         |
+| `nisw`  | Does not start with (case-insensitive) |
+| `iew`   | Ends with (case-insensitive)           |
+| `niew`  | Does not end with (case-insensitive)   |
+| `ie`    | Exact match (case-insensitive)         |
+| `nie`   | Inverse exact match (case-insensitive) |
+| `empty` | Is empty/null (boolean)                |

 Here is an example of a lookup expression on a string field that will return all devices with `switch` in the name:

--- a/docs/release-notes/version-4.3.md
+++ b/docs/release-notes/version-4.3.md
@@ -1,44 +1,5 @@
 # NetBox v4.3

-## v4.3.5 (2025-07-29)
-
-### Enhancements
-* [#18399](https://github.com/netbox-community/netbox/issues/18399) - Data source synchronization jobs now properly show "queued" status when enqueued
-* [#18797](https://github.com/netbox-community/netbox/issues/18797) - Added jinja2.StrictUndefined option for config template rendering to catch undefined variables
-* [#18936](https://github.com/netbox-community/netbox/issues/18936) - Cable imports now accept color names (e.g. "red", "blue") in addition to hex color codes
-* [#19840](https://github.com/netbox-community/netbox/issues/19840) - Cable imports now support specifying site information for better organization
-* [#19902](https://github.com/netbox-community/netbox/issues/19902) - Device names in rack elevation SVG exports are automatically truncated to prevent overflow beyond rack unit boundaries
-* [#19903](https://github.com/netbox-community/netbox/issues/19903) - String field filters now support `regex` and `iregex` lookups for advanced pattern matching
-* [#19910](https://github.com/netbox-community/netbox/issues/19910) - Internet-dependent links are no longer visible when running in air-gapped environments
-
-### Bug Fixes
-* [#18900](https://github.com/netbox-community/netbox/issues/18900) - REST API paginator now raises proper exceptions when attempting to paginate unordered querysets
-* [#19916](https://github.com/netbox-community/netbox/issues/19916) - Rack elevation image/label dropdown functionality restored
-* [#19934](https://github.com/netbox-community/netbox/issues/19934) - Added missing description field to tenant bulk edit form
-* [#19956](https://github.com/netbox-community/netbox/issues/19956) - Prevent duplicate deletion records in changelog from cascading deletions
-
-## v4.3.4 (2025-07-15)
-
-### Enhancements
-
-* [#18811](https://github.com/netbox-community/netbox/issues/18811) - Match expanded form IPv6 addresses in global search
-* [#19550](https://github.com/netbox-community/netbox/issues/19550) - Enable lazy loading for rack elevations
-* [#19571](https://github.com/netbox-community/netbox/issues/19571) - Add a default module type profile for expansion cards
-* [#19793](https://github.com/netbox-community/netbox/issues/19793) - Support custom dynamic navigation menu links
-* [#19828](https://github.com/netbox-community/netbox/issues/19828) - Expose L2VPN termination in interface GraphQL response
-
-### Bug Fixes
-
-* [#19413](https://github.com/netbox-community/netbox/issues/19413) - Custom fields should be grouped in filter forms
-* [#19633](https://github.com/netbox-community/netbox/issues/19633) - Introduce InvalidCondition exception and log all evaluations of invalid event rule conditions
-* [#19800](https://github.com/netbox-community/netbox/issues/19800) - Module type bulk import should support profile assignment
-* [#19806](https://github.com/netbox-community/netbox/issues/19806) - Introduce JobFailed exception to allow marking background jobs as failed
-* [#19827](https://github.com/netbox-community/netbox/issues/19827) - Enforce uniqueness for device role names & slugs
-* [#19839](https://github.com/netbox-community/netbox/issues/19839) - Enable export of parent assignment for recursively nested objects
-* [#19876](https://github.com/netbox-community/netbox/issues/19876) - Remove Markdown rendering from CustomFieldChoiceSet description field
-
---
-
 ## v4.3.3 (2025-06-26)

 ### Enhancements
--- a/netbox/core/api/views.py
+++ b/netbox/core/api/views.py
@@ -1,28 +1,29 @@
 from django.http import Http404, HttpResponse
 from django.shortcuts import get_object_or_404
 from django.utils.translation import gettext_lazy as _
-from django_rq.queues import get_redis_connection
-from django_rq.settings import QUEUES_LIST
-from django_rq.utils import get_statistics
 from drf_spectacular.types import OpenApiTypes
 from drf_spectacular.utils import extend_schema
-from rest_framework import viewsets
 from rest_framework.decorators import action
 from rest_framework.exceptions import PermissionDenied
-from rest_framework.permissions import IsAdminUser
 from rest_framework.response import Response
 from rest_framework.routers import APIRootView
 from rest_framework.viewsets import ReadOnlyModelViewSet
-from rq.job import Job as RQ_Job
-from rq.worker import Worker

 from core import filtersets
+from core.choices import DataSourceStatusChoices
 from core.jobs import SyncDataSourceJob
 from core.models import *
 from core.utils import delete_rq_job, enqueue_rq_job, get_rq_jobs, requeue_rq_job, stop_rq_job
+from django_rq.queues import get_redis_connection
+from django_rq.utils import get_statistics
+from django_rq.settings import QUEUES_LIST
 from netbox.api.metadata import ContentTypeMetadata
 from netbox.api.pagination import LimitOffsetListPagination
 from netbox.api.viewsets import NetBoxModelViewSet, NetBoxReadOnlyModelViewSet
+from rest_framework import viewsets
+from rest_framework.permissions import IsAdminUser
+from rq.job import Job as RQ_Job
+from rq.worker import Worker
 from . import serializers


@@ -49,8 +50,10 @@ class DataSourceViewSet(NetBoxModelViewSet):
        if not request.user.has_perm('core.sync_datasource', obj=datasource):
            raise PermissionDenied(_("This user does not have permission to synchronize this data source."))

-        # Enqueue the sync job
+        # Enqueue the sync job & update the DataSource's status
        SyncDataSourceJob.enqueue(instance=datasource, user=request.user)
+        datasource.status = DataSourceStatusChoices.QUEUED
+        DataSource.objects.filter(pk=datasource.pk).update(status=datasource.status)

        serializer = serializers.DataSourceSerializer(datasource, context={'request': request})

--- a/netbox/core/jobs.py
+++ b/netbox/core/jobs.py
@@ -21,17 +21,6 @@ class SyncDataSourceJob(JobRunner):
    class Meta:
        name = 'Synchronization'

-    @classmethod
-    def enqueue(cls, *args, **kwargs):
-        job = super().enqueue(*args, **kwargs)
-
-        # Update the DataSource's synchronization status to queued
-        if datasource := job.object:
-            datasource.status = DataSourceStatusChoices.QUEUED
-            DataSource.objects.filter(pk=datasource.pk).update(status=datasource.status)
-
-        return job
-
    def run(self, *args, **kwargs):
        datasource = DataSource.objects.get(pk=self.job.object_id)

--- a/netbox/core/signals.py
+++ b/netbox/core/signals.py
@@ -1,12 +1,10 @@
 import logging
-from threading import local

 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ValidationError
 from django.db.models.fields.reverse_related import ManyToManyRel, ManyToOneRel
 from django.db.models.signals import m2m_changed, post_save, pre_delete
 from django.dispatch import receiver, Signal
-from django.core.signals import request_finished
 from django.utils.translation import gettext_lazy as _
 from django_prometheus.models import model_deletes, model_inserts, model_updates

@@ -44,10 +42,6 @@ clear_events = Signal()
 # Change logging & event handling
 #

-# Used to track received signals per object
-_signals_received = local()
-
-
@receiver((post_save, m2m_changed))
 def handle_changed_object(sender, instance, **kwargs):
    """
@@ -136,16 +130,6 @@ def handle_deleted_object(sender, instance, **kwargs):
    if request is None:
        return

-    # Check whether we've already processed a pre_delete signal for this object. (This can
-    # happen e.g. when both a parent object and its child are deleted simultaneously, due
-    # to cascading deletion.)
-    if not hasattr(_signals_received, 'pre_delete'):
-        _signals_received.pre_delete = set()
-    signature = (ContentType.objects.get_for_model(instance), instance.pk)
-    if signature in _signals_received.pre_delete:
-        return
-    _signals_received.pre_delete.add(signature)
-
    # Record an ObjectChange if applicable
    if hasattr(instance, 'to_objectchange'):
        if hasattr(instance, 'snapshot') and not getattr(instance, '_prechange_snapshot', None):
@@ -195,14 +179,6 @@ def handle_deleted_object(sender, instance, **kwargs):
    model_deletes.labels(instance._meta.model_name).inc()


-@receiver(request_finished)
-def clear_signal_history(sender, **kwargs):
-    """
-    Clear out the signals history once the request is finished.
-    """
-    _signals_received.pre_delete = set()
-
-
@receiver(clear_events)
 def clear_events_queue(sender, **kwargs):
    """
--- a/netbox/core/tests/test_changelog.py
+++ b/netbox/core/tests/test_changelog.py
@@ -346,38 +346,6 @@ class ChangeLogViewTest(ModelViewTestCase):
        self.assertEqual(changes[1].changed_object_type, ContentType.objects.get_for_model(Interface))
        self.assertEqual(changes[2].changed_object_type, ContentType.objects.get_for_model(Device))

-    def test_duplicate_deletions(self):
-        """
-        Check that a cascading deletion event does not generate multiple "deleted" ObjectChange records for
-        the same object.
-        """
-        role1 = DeviceRole(name='Role 1', slug='role-1')
-        role1.save()
-        role2 = DeviceRole(name='Role 2', slug='role-2', parent=role1)
-        role2.save()
-        pk_list = [role1.pk, role2.pk]
-
-        # Delete both objects simultaneously
-        form_data = {
-            'pk': pk_list,
-            'confirm': True,
-            '_confirm': True,
-        }
-        request = {
-            'path': reverse('dcim:devicerole_bulk_delete'),
-            'data': post_data(form_data),
-        }
-        self.add_permissions('dcim.delete_devicerole')
-        self.assertHttpStatus(self.client.post(**request), 302)
-
-        # This should result in exactly one change record per object
-        objectchanges = ObjectChange.objects.filter(
-            changed_object_type=ContentType.objects.get_for_model(DeviceRole),
-            changed_object_id__in=pk_list,
-            action=ObjectChangeActionChoices.ACTION_DELETE
-        )
-        self.assertEqual(objectchanges.count(), 2)
-

 class ChangeLogAPITest(APITestCase):

--- a/netbox/core/views.py
+++ b/netbox/core/views.py
@@ -33,6 +33,7 @@ from utilities.json import ConfigJSONEncoder
 from utilities.query import count_related
 from utilities.views import ContentTypePermissionRequiredMixin, GetRelatedModelsMixin, register_model_view
 from . import filtersets, forms, tables
+from .choices import DataSourceStatusChoices
 from .jobs import SyncDataSourceJob
 from .models import *
 from .plugins import get_catalog_plugins, get_local_plugins
@@ -77,8 +78,12 @@ class DataSourceSyncView(BaseObjectView):

    def post(self, request, pk):
        datasource = get_object_or_404(self.queryset, pk=pk)
-        # Enqueue the sync job
+
+        # Enqueue the sync job & update the DataSource's status
        job = SyncDataSourceJob.enqueue(instance=datasource, user=request.user)
+        datasource.status = DataSourceStatusChoices.QUEUED
+        DataSource.objects.filter(pk=datasource.pk).update(status=datasource.status)
+
        messages.success(
            request,
            _("Queued job #{id} to sync {datasource}").format(id=job.pk, datasource=datasource)
--- a/netbox/dcim/forms/bulk_import.py
+++ b/netbox/dcim/forms/bulk_import.py
@@ -470,8 +470,8 @@ class ModuleTypeImportForm(NetBoxModelImportForm):
    class Meta:
        model = ModuleType
        fields = [
-            'manufacturer', 'model', 'part_number', 'description', 'airflow', 'weight', 'weight_unit', 'profile',
-            'comments', 'tags'
+            'manufacturer', 'model', 'part_number', 'description', 'airflow', 'weight', 'weight_unit', 'comments',
+            'tags',
        ]


@@ -1335,13 +1335,6 @@ class MACAddressImportForm(NetBoxModelImportForm):

 class CableImportForm(NetBoxModelImportForm):
    # Termination A
-    side_a_site = CSVModelChoiceField(
-        label=_('Side A site'),
-        queryset=Site.objects.all(),
-        required=False,
-        to_field_name='name',
-        help_text=_('Site of parent device A (if any)'),
-    )
    side_a_device = CSVModelChoiceField(
        label=_('Side A device'),
        queryset=Device.objects.all(),
@@ -1360,13 +1353,6 @@ class CableImportForm(NetBoxModelImportForm):
    )

    # Termination B
-    side_b_site = CSVModelChoiceField(
-        label=_('Side B site'),
-        queryset=Site.objects.all(),
-        required=False,
-        to_field_name='name',
-        help_text=_('Site of parent device B (if any)'),
-    )
    side_b_device = CSVModelChoiceField(
        label=_('Side B device'),
        queryset=Device.objects.all(),
@@ -1410,39 +1396,14 @@ class CableImportForm(NetBoxModelImportForm):
        required=False,
        help_text=_('Length unit')
    )
-    color = forms.CharField(
-        label=_('Color'),
-        required=False,
-        max_length=16,
-        help_text=_('Color name (e.g. "Red") or hex code (e.g. "f44336")')
-    )

    class Meta:
        model = Cable
        fields = [
-            'side_a_site', 'side_a_device', 'side_a_type', 'side_a_name', 'side_b_site', 'side_b_device', 'side_b_type',
-            'side_b_name', 'type', 'status', 'tenant', 'label', 'color', 'length', 'length_unit', 'description',
-            'comments', 'tags',
+            'side_a_device', 'side_a_type', 'side_a_name', 'side_b_device', 'side_b_type', 'side_b_name', 'type',
+            'status', 'tenant', 'label', 'color', 'length', 'length_unit', 'description', 'comments', 'tags',
        ]

-    def __init__(self, data=None, *args, **kwargs):
-        super().__init__(data, *args, **kwargs)
-
-        if data:
-            # Limit choices for side_a_device to the assigned side_a_site
-            if side_a_site := data.get('side_a_site'):
-                side_a_device_params = {f'site__{self.fields["side_a_site"].to_field_name}': side_a_site}
-                self.fields['side_a_device'].queryset = self.fields['side_a_device'].queryset.filter(
-                    **side_a_device_params
-                )
-
-            # Limit choices for side_b_device to the assigned side_b_site
-            if side_b_site := data.get('side_b_site'):
-                side_b_device_params = {f'site__{self.fields["side_b_site"].to_field_name}': side_b_site}
-                self.fields['side_b_device'].queryset = self.fields['side_b_device'].queryset.filter(
-                    **side_b_device_params
-                )
-
    def _clean_side(self, side):
        """
        Derive a Cable's A/B termination objects.
@@ -1479,24 +1440,6 @@ class CableImportForm(NetBoxModelImportForm):
        setattr(self.instance, f'{side}_terminations', [termination_object])
        return termination_object

-    def _clean_color(self, color):
-        """
-        Derive a colors hex code
-
-        :param color: color as hex or color name
-        """
-        color_parsed = color.strip().lower()
-
-        for hex_code, label in ColorChoices.CHOICES:
-            if color.lower() == label.lower():
-                color_parsed = hex_code
-
-        if len(color_parsed) > 6:
-            raise forms.ValidationError(
-                _(f"{color} did not match any used color name and was longer than six characters: invalid hex.")
-            )
-        return color_parsed
-
    def clean_side_a_name(self):
        return self._clean_side('a')

@@ -1508,14 +1451,11 @@ class CableImportForm(NetBoxModelImportForm):
        length_unit = self.cleaned_data.get('length_unit', None)
        return length_unit if length_unit is not None else ''

-    def clean_color(self):
-        color = self.cleaned_data.get('color', None)
-        return self._clean_color(color) if color is not None else ''
+
 #
 # Virtual chassis
 #

-
 class VirtualChassisImportForm(NetBoxModelImportForm):
    master = CSVModelChoiceField(
        label=_('Master'),
--- a/netbox/dcim/graphql/types.py
+++ b/netbox/dcim/graphql/types.py
@@ -33,7 +33,6 @@ if TYPE_CHECKING:
    from tenancy.graphql.types import TenantType
    from users.graphql.types import UserType
    from virtualization.graphql.types import ClusterType, VMInterfaceType, VirtualMachineType
-    from vpn.graphql.types import L2VPNTerminationType
    from wireless.graphql.types import WirelessLANType, WirelessLinkType

 __all__ = (
@@ -441,7 +440,6 @@ class InterfaceType(IPAddressesMixin, ModularComponentType, CabledObjectMixin, P
    primary_mac_address: Annotated["MACAddressType", strawberry.lazy('dcim.graphql.types')] | None
    qinq_svlan: Annotated["VLANType", strawberry.lazy('ipam.graphql.types')] | None
    vlan_translation_policy: Annotated["VLANTranslationPolicyType", strawberry.lazy('ipam.graphql.types')] | None
-    l2vpn_termination: Annotated["L2VPNTerminationType", strawberry.lazy('vpn.graphql.types')] | None

    vdcs: List[Annotated["VirtualDeviceContextType", strawberry.lazy('dcim.graphql.types')]]
    tagged_vlans: List[Annotated["VLANType", strawberry.lazy('ipam.graphql.types')]]
--- a/netbox/dcim/migrations/0208_devicerole_uniqueness.py
+++ b/netbox/dcim/migrations/0208_devicerole_uniqueness.py
@@ -1,44 +0,0 @@
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('dcim', '0207_remove_redundant_indexes'),
-        ('extras', '0129_fix_script_paths'),
-    ]
-
-    operations = [
-        migrations.AddConstraint(
-            model_name='devicerole',
-            constraint=models.UniqueConstraint(
-                fields=('parent', 'name'),
-                name='dcim_devicerole_parent_name'
-            ),
-        ),
-        migrations.AddConstraint(
-            model_name='devicerole',
-            constraint=models.UniqueConstraint(
-                condition=models.Q(('parent__isnull', True)),
-                fields=('name',),
-                name='dcim_devicerole_name',
-                violation_error_message='A top-level device role with this name already exists.'
-            ),
-        ),
-        migrations.AddConstraint(
-            model_name='devicerole',
-            constraint=models.UniqueConstraint(
-                fields=('parent', 'slug'),
-                name='dcim_devicerole_parent_slug'
-            ),
-        ),
-        migrations.AddConstraint(
-            model_name='devicerole',
-            constraint=models.UniqueConstraint(
-                condition=models.Q(('parent__isnull', True)),
-                fields=('slug',),
-                name='dcim_devicerole_slug',
-                violation_error_message='A top-level device role with this slug already exists.'
-            ),
-        ),
-    ]
--- a/netbox/dcim/models/devices.py
+++ b/netbox/dcim/models/devices.py
@@ -398,28 +398,6 @@ class DeviceRole(NestedGroupModel):

    class Meta:
        ordering = ('name',)
-        constraints = (
-            models.UniqueConstraint(
-                fields=('parent', 'name'),
-                name='%(app_label)s_%(class)s_parent_name'
-            ),
-            models.UniqueConstraint(
-                fields=('name',),
-                name='%(app_label)s_%(class)s_name',
-                condition=Q(parent__isnull=True),
-                violation_error_message=_("A top-level device role with this name already exists.")
-            ),
-            models.UniqueConstraint(
-                fields=('parent', 'slug'),
-                name='%(app_label)s_%(class)s_parent_slug'
-            ),
-            models.UniqueConstraint(
-                fields=('slug',),
-                name='%(app_label)s_%(class)s_slug',
-                condition=Q(parent__isnull=True),
-                violation_error_message=_("A top-level device role with this slug already exists.")
-            ),
-        )
        verbose_name = _('device role')
        verbose_name_plural = _('device roles')

--- a/netbox/dcim/svg/racks.py
+++ b/netbox/dcim/svg/racks.py
@@ -3,7 +3,6 @@ import svgwrite
 from svgwrite.container import Hyperlink
 from svgwrite.image import Image
 from svgwrite.gradients import LinearGradient
-from svgwrite.masking import ClipPath
 from svgwrite.shapes import Rect
 from svgwrite.text import Text

@@ -68,20 +67,6 @@ def get_device_description(device):
    return description


-def truncate_text(text, width, font_size=15):
-    """
-    Truncate text to fit within the width of a rectangle.
-
-    :param text: The text to truncate
-    :param width: Width of rectangle
-    :param font_size: Font size (default is 15, ~0.875rem)
-    """
-    char_width = font_size * 0.6  # 0.6 is an approximation of the average character width in pixels
-    max_char = int(width / char_width)
-
-    return text if len(text) <= max_char else text[:max_char] + '...'
-
-
 class RackElevationSVG:
    """
    Use this class to render a rack elevation as an SVG image.
@@ -192,26 +177,12 @@ class RackElevationSVG:
        link = Hyperlink(href=f'{self.base_url}{device.get_absolute_url()}', target="_parent")
        link.set_desc(description)

-        # Create clipPath element
-        # This is necessary as fallback because the truncate_text method is an approximation
-        clip_id = f"clip-{device.id}"
-        clip_path = ClipPath(id=clip_id)
-        clip_path.add(Rect(coords, size))
-
-        self.drawing.defs.add(clip_path)
-
-        # Name to display
-        display_name = truncate_text(name, size[0])
-
        # Add rect element to hyperlink
        if color:
            link.add(Rect(coords, size, style=f'fill: #{color}', class_=f'slot{css_extra}'))
        else:
            link.add(Rect(coords, size, class_=f'slot blocked{css_extra}'))
-        link.add(
-            Text(display_name, insert=text_coords, fill=text_color, clip_path=f"url(#{clip_id})",
-                 class_=f'label{css_extra}')
-        )
+        link.add(Text(name, insert=text_coords, fill=text_color, class_=f'label{css_extra}'))

        # Embed device type image if provided
        if self.include_images and image:
--- a/netbox/dcim/tables/devices.py
+++ b/netbox/dcim/tables/devices.py
@@ -63,10 +63,6 @@ class DeviceRoleTable(NetBoxTable):
        verbose_name=_('Name'),
        linkify=True
    )
-    parent = tables.Column(
-        verbose_name=_('Parent'),
-        linkify=True,
-    )
    device_count = columns.LinkedCountColumn(
        viewname='dcim:device_list',
        url_params={'role_id': 'pk'},
@@ -92,8 +88,8 @@ class DeviceRoleTable(NetBoxTable):
    class Meta(NetBoxTable.Meta):
        model = models.DeviceRole
        fields = (
-            'pk', 'id', 'name', 'parent', 'device_count', 'vm_count', 'color', 'vm_role', 'config_template',
-            'description', 'slug', 'tags', 'actions', 'created', 'last_updated',
+            'pk', 'id', 'name', 'device_count', 'vm_count', 'color', 'vm_role', 'config_template', 'description',
+            'slug', 'tags', 'actions', 'created', 'last_updated',
        )
        default_columns = ('pk', 'name', 'device_count', 'vm_count', 'color', 'vm_role', 'description')

--- a/netbox/dcim/tables/sites.py
+++ b/netbox/dcim/tables/sites.py
@@ -24,10 +24,6 @@ class RegionTable(ContactsColumnMixin, NetBoxTable):
        verbose_name=_('Name'),
        linkify=True
    )
-    parent = tables.Column(
-        verbose_name=_('Parent'),
-        linkify=True,
-    )
    site_count = columns.LinkedCountColumn(
        viewname='dcim:site_list',
        url_params={'region_id': 'pk'},
@@ -43,7 +39,7 @@ class RegionTable(ContactsColumnMixin, NetBoxTable):
    class Meta(NetBoxTable.Meta):
        model = Region
        fields = (
-            'pk', 'id', 'name', 'parent', 'slug', 'site_count', 'description', 'comments', 'contacts', 'tags',
+            'pk', 'id', 'name', 'slug', 'site_count', 'description', 'comments', 'contacts', 'tags',
            'created', 'last_updated', 'actions',
        )
        default_columns = ('pk', 'name', 'site_count', 'description')
@@ -58,10 +54,6 @@ class SiteGroupTable(ContactsColumnMixin, NetBoxTable):
        verbose_name=_('Name'),
        linkify=True
    )
-    parent = tables.Column(
-        verbose_name=_('Parent'),
-        linkify=True,
-    )
    site_count = columns.LinkedCountColumn(
        viewname='dcim:site_list',
        url_params={'group_id': 'pk'},
@@ -77,7 +69,7 @@ class SiteGroupTable(ContactsColumnMixin, NetBoxTable):
    class Meta(NetBoxTable.Meta):
        model = SiteGroup
        fields = (
-            'pk', 'id', 'name', 'parent', 'slug', 'site_count', 'description', 'comments', 'contacts', 'tags',
+            'pk', 'id', 'name', 'slug', 'site_count', 'description', 'comments', 'contacts', 'tags',
            'created', 'last_updated', 'actions',
        )
        default_columns = ('pk', 'name', 'site_count', 'description')
@@ -143,10 +135,6 @@ class LocationTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable):
        verbose_name=_('Name'),
        linkify=True
    )
-    parent = tables.Column(
-        verbose_name=_('Parent'),
-        linkify=True,
-    )
    site = tables.Column(
        verbose_name=_('Site'),
        linkify=True
@@ -182,8 +170,8 @@ class LocationTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable):
    class Meta(NetBoxTable.Meta):
        model = Location
        fields = (
-            'pk', 'id', 'name', 'parent', 'site', 'status', 'facility', 'tenant', 'tenant_group', 'rack_count',
-            'device_count', 'description', 'slug', 'comments', 'contacts', 'tags', 'actions', 'created', 'last_updated',
+            'pk', 'id', 'name', 'site', 'status', 'facility', 'tenant', 'tenant_group', 'rack_count', 'device_count',
+            'description', 'slug', 'comments', 'contacts', 'tags', 'actions', 'created', 'last_updated',
            'vlangroup_count',
        )
        default_columns = (
--- a/netbox/dcim/tests/test_views.py
+++ b/netbox/dcim/tests/test_views.py
@@ -3,7 +3,7 @@ from decimal import Decimal
 from zoneinfo import ZoneInfo

 import yaml
-from django.test import override_settings, tag
+from django.test import override_settings
 from django.urls import reverse
 from netaddr import EUI

@@ -1000,7 +1000,18 @@ inventory-items:
        self.assertEqual(response.get('Content-Type'), 'text/csv; charset=utf-8')


-class ModuleTypeTestCase(ViewTestCases.PrimaryObjectViewTestCase):
+# TODO: Change base class to PrimaryObjectViewTestCase
+# Blocked by absence of bulk import view for ModuleTypes
+class ModuleTypeTestCase(
+    ViewTestCases.GetObjectViewTestCase,
+    ViewTestCases.GetObjectChangelogViewTestCase,
+    ViewTestCases.CreateObjectViewTestCase,
+    ViewTestCases.EditObjectViewTestCase,
+    ViewTestCases.DeleteObjectViewTestCase,
+    ViewTestCases.ListObjectsViewTestCase,
+    ViewTestCases.BulkEditObjectsViewTestCase,
+    ViewTestCases.BulkDeleteObjectsViewTestCase
+):
    model = ModuleType

    @classmethod
@@ -1012,7 +1023,7 @@ class ModuleTypeTestCase(ViewTestCases.PrimaryObjectViewTestCase):
        )
        Manufacturer.objects.bulk_create(manufacturers)

-        module_types = ModuleType.objects.bulk_create([
+        ModuleType.objects.bulk_create([
            ModuleType(model='Module Type 1', manufacturer=manufacturers[0]),
            ModuleType(model='Module Type 2', manufacturer=manufacturers[0]),
            ModuleType(model='Module Type 3', manufacturer=manufacturers[0]),
@@ -1020,8 +1031,6 @@ class ModuleTypeTestCase(ViewTestCases.PrimaryObjectViewTestCase):

        tags = create_tags('Alpha', 'Bravo', 'Charlie')

-        fan_module_type_profile = ModuleTypeProfile.objects.get(name='Fan')
-
        cls.form_data = {
            'manufacturer': manufacturers[1].pk,
            'model': 'Device Type X',
@@ -1035,70 +1044,6 @@ class ModuleTypeTestCase(ViewTestCases.PrimaryObjectViewTestCase):
            'part_number': '456DEF',
        }

-        cls.csv_data = (
-            "manufacturer,model,part_number,comments,profile",
-            f"Manufacturer 1,fan0,generic-fan,,{fan_module_type_profile.name}"
-        )
-
-        cls.csv_update_data = (
-            "id,model",
-            f"{module_types[0].id},test model",
-        )
-
-    @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
-    def test_bulk_update_objects_with_permission(self):
-        self.add_permissions(
-            'dcim.add_consoleporttemplate',
-            'dcim.add_consoleserverporttemplate',
-            'dcim.add_powerporttemplate',
-            'dcim.add_poweroutlettemplate',
-            'dcim.add_interfacetemplate',
-            'dcim.add_frontporttemplate',
-            'dcim.add_rearporttemplate',
-            'dcim.add_modulebaytemplate',
-        )
-
-        # run base test
-        super().test_bulk_update_objects_with_permission()
-
-    @tag('regression')
-    @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'], EXEMPT_EXCLUDE_MODELS=[])
-    def test_bulk_import_objects_with_permission(self):
-        self.add_permissions(
-            'dcim.add_consoleporttemplate',
-            'dcim.add_consoleserverporttemplate',
-            'dcim.add_powerporttemplate',
-            'dcim.add_poweroutlettemplate',
-            'dcim.add_interfacetemplate',
-            'dcim.add_frontporttemplate',
-            'dcim.add_rearporttemplate',
-            'dcim.add_modulebaytemplate',
-        )
-
-        # run base test
-        super().test_bulk_import_objects_with_permission()
-
-        # TODO: remove extra regression asserts once parent test supports testing all import fields
-        fan_module_type = ModuleType.objects.get(part_number='generic-fan')
-        fan_module_type_profile = ModuleTypeProfile.objects.get(name='Fan')
-
-        assert fan_module_type.profile == fan_module_type_profile
-
-    @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'], EXEMPT_EXCLUDE_MODELS=[])
-    def test_bulk_import_objects_with_constrained_permission(self):
-        self.add_permissions(
-            'dcim.add_consoleporttemplate',
-            'dcim.add_consoleserverporttemplate',
-            'dcim.add_powerporttemplate',
-            'dcim.add_poweroutlettemplate',
-            'dcim.add_interfacetemplate',
-            'dcim.add_frontporttemplate',
-            'dcim.add_rearporttemplate',
-            'dcim.add_modulebaytemplate',
-        )
-
-        super().test_bulk_import_objects_with_constrained_permission()
-
    @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
    def test_moduletype_consoleports(self):
        moduletype = ModuleType.objects.first()
@@ -1859,9 +1804,9 @@ class DeviceRoleTestCase(ViewTestCases.OrganizationalObjectViewTestCase):

        cls.csv_data = (
            "name,slug,color",
-            "Device Role 6,device-role-6,ff0000",
-            "Device Role 7,device-role-7,00ff00",
-            "Device Role 8,device-role-8,0000ff",
+            "Device Role 4,device-role-4,ff0000",
+            "Device Role 5,device-role-5,00ff00",
+            "Device Role 6,device-role-6,0000ff",
        )

        cls.csv_update_data = (
@@ -3266,27 +3211,17 @@ class CableTestCase(
    @classmethod
    def setUpTestData(cls):

-        sites = (
-            Site(name='Site 1', slug='site-1'),
-            Site(name='Site 2', slug='site-2'),
-        )
-        Site.objects.bulk_create(sites)
+        site = Site.objects.create(name='Site 1', slug='site-1')
        manufacturer = Manufacturer.objects.create(name='Manufacturer 1', slug='manufacturer-1')
        devicetype = DeviceType.objects.create(model='Device Type 1', manufacturer=manufacturer)
        role = DeviceRole.objects.create(name='Device Role 1', slug='device-role-1')
        vc = VirtualChassis.objects.create(name='Virtual Chassis')

-        # NOTE: By design, NetBox now allows for the creation of devices with the same name if they belong to
-        # different sites.
-        # The CSV test below demonstrates that devices with identical names on different sites can be created
-        # and referenced successfully.
        devices = (
-            # Create 'Device 1' assigned to 'Site 1'
-            Device(name='Device 1', site=sites[0], device_type=devicetype, role=role),
-            Device(name='Device 2', site=sites[0], device_type=devicetype, role=role),
-            Device(name='Device 3', site=sites[0], device_type=devicetype, role=role),
-            # Create 'Device 1' assigned to 'Site 2' (allowed since the site is different)
-            Device(name='Device 1', site=sites[1], device_type=devicetype, role=role),
+            Device(name='Device 1', site=site, device_type=devicetype, role=role),
+            Device(name='Device 2', site=site, device_type=devicetype, role=role),
+            Device(name='Device 3', site=site, device_type=devicetype, role=role),
+            Device(name='Device 4', site=site, device_type=devicetype, role=role),
        )
        Device.objects.bulk_create(devices)

@@ -3337,15 +3272,13 @@ class CableTestCase(
            'tags': [t.pk for t in tags],
        }

-        # Ensure that CSV bulk import supports assigning terminations from parent devices that share
-        # the same device name, provided those devices belong to different sites.
        cls.csv_data = (
-            "side_a_site,side_a_device,side_a_type,side_a_name,side_b_site,side_b_device,side_b_type,side_b_name",
-            "Site 1,Device 3,dcim.interface,Interface 1,Site 2,Device 1,dcim.interface,Interface 1",
-            "Site 1,Device 3,dcim.interface,Interface 2,Site 2,Device 1,dcim.interface,Interface 2",
-            "Site 1,Device 3,dcim.interface,Interface 3,Site 2,Device 1,dcim.interface,Interface 3",
-            "Site 1,Device 1,dcim.interface,Device 2 Interface,Site 2,Device 1,dcim.interface,Interface 4",
-            "Site 1,Device 1,dcim.interface,Device 3 Interface,Site 2,Device 1,dcim.interface,Interface 5",
+            "side_a_device,side_a_type,side_a_name,side_b_device,side_b_type,side_b_name",
+            "Device 3,dcim.interface,Interface 1,Device 4,dcim.interface,Interface 1",
+            "Device 3,dcim.interface,Interface 2,Device 4,dcim.interface,Interface 2",
+            "Device 3,dcim.interface,Interface 3,Device 4,dcim.interface,Interface 3",
+            "Device 1,dcim.interface,Device 2 Interface,Device 4,dcim.interface,Interface 4",
+            "Device 1,dcim.interface,Device 3 Interface,Device 4,dcim.interface,Interface 5",
        )

        cls.csv_update_data = (
--- a/netbox/extras/api/views.py
+++ b/netbox/extras/api/views.py
@@ -185,9 +185,7 @@ class TagViewSet(NetBoxModelViewSet):


 class TaggedItemViewSet(RetrieveModelMixin, ListModelMixin, BaseViewSet):
-    queryset = TaggedItem.objects.prefetch_related(
-        'content_type', 'content_object', 'tag'
-    ).order_by('tag__weight', 'tag__name')
+    queryset = TaggedItem.objects.prefetch_related('content_type', 'content_object', 'tag')
    serializer_class = serializers.TaggedItemSerializer
    filterset_class = filtersets.TaggedItemFilterSet

--- a/netbox/extras/conditions.py
+++ b/netbox/extras/conditions.py
@@ -1,14 +1,13 @@
 import functools
-import operator
 import re
 from django.utils.translation import gettext as _

 __all__ = (
    'Condition',
    'ConditionSet',
-    'InvalidCondition',
 )

+
 AND = 'and'
 OR = 'or'

@@ -20,10 +19,6 @@ def is_ruleset(data):
    return type(data) is dict and len(data) == 1 and list(data.keys())[0] in (AND, OR)


-class InvalidCondition(Exception):
-    pass
-
-
 class Condition:
    """
    An individual conditional rule that evaluates a single attribute and its value.
@@ -66,7 +61,6 @@ class Condition:

        self.attr = attr
        self.value = value
-        self.op = op
        self.eval_func = getattr(self, f'eval_{op}')
        self.negate = negate

@@ -76,17 +70,16 @@ class Condition:
        """
        def _get(obj, key):
            if isinstance(obj, list):
-                return [operator.getitem(item or {}, key) for item in obj]
-            return operator.getitem(obj or {}, key)
+                return [dict.get(i, key) for i in obj]
+
+            return dict.get(obj, key)

        try:
            value = functools.reduce(_get, self.attr.split('.'), data)
-        except KeyError:
-            raise InvalidCondition(f"Invalid key path: {self.attr}")
-        try:
-            result = self.eval_func(value)
-        except TypeError as e:
-            raise InvalidCondition(f"Invalid data type at '{self.attr}' for '{self.op}' evaluation: {e}")
+        except TypeError:
+            # Invalid key path
+            value = None
+        result = self.eval_func(value)

        if self.negate:
            return not result
--- a/netbox/extras/constants.py
+++ b/netbox/extras/constants.py
@@ -21,12 +21,6 @@ WEBHOOK_EVENT_TYPES = {
    JOB_ERRORED: 'job_ended',
 }

-# Jinja environment parameters which support path imports
-JINJA_ENV_PARAMS_WITH_PATH_IMPORT = (
-    'undefined',
-    'finalize',
-)
-
 # Dashboard
 DEFAULT_DASHBOARD = [
    {
--- a/netbox/extras/events.py
+++ b/netbox/extras/events.py
@@ -192,5 +192,5 @@ def flush_events(events):
            try:
                func = import_string(name)
                func(events)
-            except ImportError as e:
+            except Exception as e:
                logger.error(_("Cannot import events pipeline {name} error: {error}").format(name=name, error=e))
--- a/netbox/extras/lookups.py
+++ b/netbox/extras/lookups.py
@@ -18,22 +18,9 @@ class Empty(Lookup):
            return f"CAST(LENGTH({sql}) AS BOOLEAN) IS TRUE", params


-class NetHost(Lookup):
-    """
-    Similar to ipam.lookups.NetHost, but casts the field to INET.
-    """
-    lookup_name = 'net_host'
-
-    def as_sql(self, qn, connection):
-        lhs, lhs_params = self.process_lhs(qn, connection)
-        rhs, rhs_params = self.process_rhs(qn, connection)
-        params = lhs_params + rhs_params
-        return 'HOST(CAST(%s AS INET)) = HOST(%s)' % (lhs, rhs), params
-
-
 class NetContainsOrEquals(Lookup):
    """
-    Similar to ipam.lookups.NetContainsOrEquals, but casts the field to INET.
+    This lookup has the same functionality as the one from the ipam app except lhs is cast to inet
    """
    lookup_name = 'net_contains_or_equals'

@@ -45,5 +32,4 @@ class NetContainsOrEquals(Lookup):


 CharField.register_lookup(Empty)
-CachedValueField.register_lookup(NetHost)
 CachedValueField.register_lookup(NetContainsOrEquals)
--- a/netbox/extras/models/mixins.py
+++ b/netbox/extras/models/mixins.py
@@ -2,17 +2,16 @@ import importlib.abc
 import importlib.util
 import os
 import sys
-
 from django.core.files.storage import storages
 from django.db import models
-from django.http import HttpResponse
-from django.utils.module_loading import import_string
 from django.utils.translation import gettext_lazy as _
+from django.http import HttpResponse

-from extras.constants import DEFAULT_MIME_TYPE, JINJA_ENV_PARAMS_WITH_PATH_IMPORT
+from extras.constants import DEFAULT_MIME_TYPE
 from extras.utils import filename_from_model, filename_from_object
 from utilities.jinja2 import render_jinja2

+
 __all__ = (
    'PythonModuleMixin',
    'RenderTemplateMixin',
@@ -126,22 +125,12 @@ class RenderTemplateMixin(models.Model):
            class_name=self.__class__
        ))

-    def get_environment_params(self):
-        """
-        Pre-processing of any defined Jinja environment parameters (e.g. to support path resolution).
-        """
-        params = self.environment_params or {}
-        for name, value in params.items():
-            if name in JINJA_ENV_PARAMS_WITH_PATH_IMPORT and type(value) is str:
-                params[name] = import_string(value)
-        return params
-
    def render(self, context=None, queryset=None):
        """
        Render the template with the provided context. The context is passed to the Jinja2 environment as a dictionary.
        """
        context = self.get_context(context=context, queryset=queryset)
-        env_params = self.get_environment_params()
+        env_params = self.environment_params or {}
        output = render_jinja2(self.template_code, context, env_params, getattr(self, 'data_file', None))

        # Replace CRLF-style line terminators
--- a/netbox/extras/models/models.py
+++ b/netbox/extras/models/models.py
@@ -13,7 +13,7 @@ from rest_framework.utils.encoders import JSONEncoder

 from core.models import ObjectType
 from extras.choices import *
-from extras.conditions import ConditionSet, InvalidCondition
+from extras.conditions import ConditionSet
 from extras.constants import *
 from extras.utils import image_upload
 from extras.models.mixins import RenderTemplateMixin
@@ -142,15 +142,7 @@ class EventRule(CustomFieldsMixin, ExportTemplatesMixin, TagsMixin, ChangeLogged
        if not self.conditions:
            return True

-        logger = logging.getLogger('netbox.event_rules')
-
-        try:
-            result = ConditionSet(self.conditions).eval(data)
-            logger.debug(f'{self.name}: Evaluated as {result}')
-            return result
-        except InvalidCondition as e:
-            logger.error(f"{self.name}: Evaluation failed. {e}")
-            return False
+        return ConditionSet(self.conditions).eval(data)


 class Webhook(CustomFieldsMixin, ExportTemplatesMixin, TagsMixin, ChangeLoggedModel):
--- a/netbox/extras/models/tags.py
+++ b/netbox/extras/models/tags.py
@@ -83,6 +83,3 @@ class TaggedItem(GenericTaggedItemBase):
        indexes = [models.Index(fields=["content_type", "object_id"])]
        verbose_name = _('tagged item')
        verbose_name_plural = _('tagged items')
-        # Note: while there is no ordering applied here (because it would basically be done on fields
-        # of the related `tag`), there is an ordering applied to extras.api.views.TaggedItemViewSet
-        # to allow for proper pagination.
--- a/netbox/extras/tests/test_conditions.py
+++ b/netbox/extras/tests/test_conditions.py
@@ -4,7 +4,7 @@ from django.test import TestCase
 from core.events import *
 from dcim.choices import SiteStatusChoices
 from dcim.models import Site
-from extras.conditions import Condition, ConditionSet, InvalidCondition
+from extras.conditions import Condition, ConditionSet
 from extras.events import serialize_for_event
 from extras.forms import EventRuleForm
 from extras.models import EventRule, Webhook
@@ -12,11 +12,16 @@ from extras.models import EventRule, Webhook

 class ConditionTestCase(TestCase):

+    def test_dotted_path_access(self):
+        c = Condition('a.b.c', 1, 'eq')
+        self.assertTrue(c.eval({'a': {'b': {'c': 1}}}))
+        self.assertFalse(c.eval({'a': {'b': {'c': 2}}}))
+        self.assertFalse(c.eval({'a': {'b': {'x': 1}}}))
+
    def test_undefined_attr(self):
        c = Condition('x', 1, 'eq')
+        self.assertFalse(c.eval({}))
        self.assertTrue(c.eval({'x': 1}))
-        with self.assertRaises(InvalidCondition):
-            c.eval({})

    #
    # Validation tests
@@ -32,13 +37,10 @@ class ConditionTestCase(TestCase):
            # dict type is unsupported
            Condition('x', 1, dict())

-    def test_invalid_op_types(self):
+    def test_invalid_op_type(self):
        with self.assertRaises(ValueError):
            # 'gt' supports only numeric values
            Condition('x', 'foo', 'gt')
-        with self.assertRaises(ValueError):
-            # 'in' supports only iterable values
-            Condition('x', 123, 'in')

    #
    # Nested attrs tests
@@ -48,10 +50,7 @@ class ConditionTestCase(TestCase):
        c = Condition('x.y.z', 1)
        self.assertTrue(c.eval({'x': {'y': {'z': 1}}}))
        self.assertFalse(c.eval({'x': {'y': {'z': 2}}}))
-        with self.assertRaises(InvalidCondition):
-            c.eval({'x': {'y': None}})
-        with self.assertRaises(InvalidCondition):
-            c.eval({'x': {'y': {'a': 1}}})
+        self.assertFalse(c.eval({'a': {'b': {'c': 1}}}))

    #
    # Operator tests
@@ -75,31 +74,23 @@ class ConditionTestCase(TestCase):
        c = Condition('x', 1, 'gt')
        self.assertTrue(c.eval({'x': 2}))
        self.assertFalse(c.eval({'x': 1}))
-        with self.assertRaises(InvalidCondition):
-            c.eval({'x': 'foo'})  # Invalid type

    def test_gte(self):
        c = Condition('x', 1, 'gte')
        self.assertTrue(c.eval({'x': 2}))
        self.assertTrue(c.eval({'x': 1}))
        self.assertFalse(c.eval({'x': 0}))
-        with self.assertRaises(InvalidCondition):
-            c.eval({'x': 'foo'})  # Invalid type

    def test_lt(self):
        c = Condition('x', 2, 'lt')
        self.assertTrue(c.eval({'x': 1}))
        self.assertFalse(c.eval({'x': 2}))
-        with self.assertRaises(InvalidCondition):
-            c.eval({'x': 'foo'})  # Invalid type

    def test_lte(self):
        c = Condition('x', 2, 'lte')
        self.assertTrue(c.eval({'x': 1}))
        self.assertTrue(c.eval({'x': 2}))
        self.assertFalse(c.eval({'x': 3}))
-        with self.assertRaises(InvalidCondition):
-            c.eval({'x': 'foo'})  # Invalid type

    def test_in(self):
        c = Condition('x', [1, 2, 3], 'in')
@@ -115,8 +106,6 @@ class ConditionTestCase(TestCase):
        c = Condition('x', 1, 'contains')
        self.assertTrue(c.eval({'x': [1, 2, 3]}))
        self.assertFalse(c.eval({'x': [2, 3, 4]}))
-        with self.assertRaises(InvalidCondition):
-            c.eval({'x': 123})  # Invalid type

    def test_contains_negated(self):
        c = Condition('x', 1, 'contains', negate=True)
--- a/netbox/ipam/models/ip.py
+++ b/netbox/ipam/models/ip.py
@@ -162,11 +162,6 @@ class Aggregate(ContactsMixin, GetAvailablePrefixesMixin, PrimaryModel):
            return self.prefix.version
        return None

-    @property
-    def ipv6_full(self):
-        if self.prefix and self.prefix.version == 6:
-            return netaddr.IPAddress(self.prefix).format(netaddr.ipv6_full)
-
    def get_child_prefixes(self):
        """
        Return all Prefixes within this Aggregate
@@ -335,11 +330,6 @@ class Prefix(ContactsMixin, GetAvailablePrefixesMixin, CachedScopeMixin, Primary
    def mask_length(self):
        return self.prefix.prefixlen if self.prefix else None

-    @property
-    def ipv6_full(self):
-        if self.prefix and self.prefix.version == 6:
-            return netaddr.IPAddress(self.prefix).format(netaddr.ipv6_full)
-
    @property
    def depth(self):
        return self._depth
@@ -818,11 +808,6 @@ class IPAddress(ContactsMixin, PrimaryModel):
        self._original_assigned_object_id = self.__dict__.get('assigned_object_id')
        self._original_assigned_object_type_id = self.__dict__.get('assigned_object_type_id')

-    @property
-    def ipv6_full(self):
-        if self.address and self.address.version == 6:
-            return netaddr.IPAddress(self.address).format(netaddr.ipv6_full)
-
    def get_duplicates(self):
        return IPAddress.objects.filter(
            vrf=self.vrf,
--- a/netbox/netbox/api/exceptions.py
+++ b/netbox/netbox/api/exceptions.py
@@ -12,7 +12,3 @@ class SerializerNotFound(Exception):

 class GraphQLTypeNotFound(Exception):
    pass
-
-
-class QuerySetNotOrdered(Exception):
-    pass
--- a/netbox/netbox/api/pagination.py
+++ b/netbox/netbox/api/pagination.py
@@ -1,7 +1,6 @@
 from django.db.models import QuerySet
 from rest_framework.pagination import LimitOffsetPagination

-from netbox.api.exceptions import QuerySetNotOrdered
 from netbox.config import get_config


@@ -16,12 +15,6 @@ class OptionalLimitOffsetPagination(LimitOffsetPagination):

    def paginate_queryset(self, queryset, request, view=None):

-        if isinstance(queryset, QuerySet) and not queryset.ordered:
-            raise QuerySetNotOrdered(
-                "Paginating over an unordered queryset is unreliable. Ensure that a minimal "
-                "ordering has been applied to the queryset for this API endpoint."
-            )
-
        if isinstance(queryset, QuerySet):
            self.count = self.get_queryset_count(queryset)
        else:
--- a/netbox/netbox/navigation/init.py
+++ b/netbox/netbox/navigation/init.py
@@ -1,7 +1,7 @@
 from dataclasses import dataclass
 from typing import Sequence, Optional

-from django.urls import reverse_lazy
+from django.urls import reverse


 __all__ = (
@@ -30,7 +30,7 @@ class MenuItemButton:

    def __post_init__(self):
        if self.link:
-            self._url = reverse_lazy(self.link)
+            self._url = reverse(self.link)

    @property
    def url(self):
@@ -54,7 +54,7 @@ class MenuItem:

    def __post_init__(self):
        if self.link:
-            self._url = reverse_lazy(self.link)
+            self._url = reverse(self.link)

    @property
    def url(self):
--- a/netbox/netbox/plugins/navigation.py
+++ b/netbox/netbox/plugins/navigation.py
@@ -1,4 +1,4 @@
-from django.urls import reverse_lazy
+from django.urls import reverse
 from django.utils.text import slugify
 from django.utils.translation import gettext as _

@@ -49,7 +49,7 @@ class PluginMenuItem:
        self.auth_required = auth_required
        self.staff_only = staff_only
        if link:
-            self._url = reverse_lazy(link)
+            self._url = reverse(link)
        if permissions is not None:
            if type(permissions) not in (list, tuple):
                raise TypeError(_("Permissions must be passed as a tuple or list."))
@@ -82,7 +82,7 @@ class PluginMenuButton:
        self.title = title
        self.icon_class = icon_class
        if link:
-            self._url = reverse_lazy(link)
+            self._url = reverse(link)
        if permissions is not None:
            if type(permissions) not in (list, tuple):
                raise TypeError(_("Permissions must be passed as a tuple or list."))
--- a/netbox/netbox/search/backends.py
+++ b/netbox/netbox/search/backends.py
@@ -115,13 +115,11 @@ class CachedValueSearchBackend(SearchBackend):
        if lookup in (LookupTypes.STARTSWITH, LookupTypes.ENDSWITH):
            # "Starts/ends with" matches are valid only on string values
            query_filter &= Q(type=FieldTypes.STRING)
-        elif lookup in (LookupTypes.PARTIAL, LookupTypes.EXACT):
+        elif lookup == LookupTypes.PARTIAL:
            try:
-                # If the value looks like an IP address, add extra filters for CIDR/INET values
+                # If the value looks like an IP address, add an extra match for CIDR values
                address = str(netaddr.IPNetwork(value.strip()).cidr)
-                query_filter |= Q(type=FieldTypes.INET) & Q(value__net_host=address)
-                if lookup == LookupTypes.PARTIAL:
-                    query_filter |= Q(type=FieldTypes.CIDR) & Q(value__net_contains_or_equals=address)
+                query_filter |= Q(type=FieldTypes.CIDR) & Q(value__net_contains_or_equals=address)
            except (AddrFormatError, ValueError):
                pass

--- a/netbox/netbox/tests/test_api.py
+++ b/netbox/netbox/tests/test_api.py
@@ -1,13 +1,8 @@
 import uuid

-from django.test import RequestFactory, TestCase
 from django.urls import reverse
-from rest_framework.request import Request

-from netbox.api.exceptions import QuerySetNotOrdered
-from netbox.api.pagination import OptionalLimitOffsetPagination
 from utilities.testing import APITestCase
-from users.models import Token


 class AppTest(APITestCase):
@@ -31,40 +26,3 @@ class AppTest(APITestCase):
        response = self.client.get(f'{url}?format=api', **self.header)

        self.assertEqual(response.status_code, 200)
-
-
-class OptionalLimitOffsetPaginationTest(TestCase):
-
-    def setUp(self):
-        self.paginator = OptionalLimitOffsetPagination()
-        self.factory = RequestFactory()
-
-    def _make_drf_request(self, path='/', query_params=None):
-        """Helper to create a proper DRF Request object"""
-        return Request(self.factory.get(path, query_params or {}))
-
-    def test_raises_exception_for_unordered_queryset(self):
-        """Should raise QuerySetNotOrdered for unordered QuerySet"""
-        queryset = Token.objects.all().order_by()
-        request = self._make_drf_request()
-
-        with self.assertRaises(QuerySetNotOrdered) as cm:
-            self.paginator.paginate_queryset(queryset, request)
-
-        error_msg = str(cm.exception)
-        self.assertIn("Paginating over an unordered queryset is unreliable", error_msg)
-        self.assertIn("Ensure that a minimal ordering has been applied", error_msg)
-
-    def test_allows_ordered_queryset(self):
-        """Should not raise exception for ordered QuerySet"""
-        queryset = Token.objects.all().order_by('created')
-        request = self._make_drf_request()
-
-        self.paginator.paginate_queryset(queryset, request)  # Should not raise exception
-
-    def test_allows_non_queryset_iterables(self):
-        """Should not raise exception for non-QuerySet iterables"""
-        iterable = [1, 2, 3, 4, 5]
-        request = self._make_drf_request()
-
-        self.paginator.paginate_queryset(iterable, request)  # Should not raise exception
--- a/netbox/project-static/dist/netbox.css
+++ b/netbox/project-static/dist/netbox.css
--- a/netbox/project-static/dist/netbox.js
+++ b/netbox/project-static/dist/netbox.js
--- a/netbox/project-static/dist/netbox.js.map
+++ b/netbox/project-static/dist/netbox.js.map
--- a/netbox/project-static/package.json
+++ b/netbox/project-static/package.json
@@ -23,13 +23,13 @@
  },
  "dependencies": {
    "@mdi/font": "7.4.47",
-    "@tabler/core": "1.4.0",
+    "@tabler/core": "1.3.2",
    "bootstrap": "5.3.7",
    "clipboard": "2.0.11",
    "flatpickr": "4.6.13",
-    "gridstack": "12.2.2",
-    "htmx.org": "2.0.6",
-    "query-string": "9.2.2",
+    "gridstack": "12.2.1",
+    "htmx.org": "2.0.5",
+    "query-string": "9.2.1",
    "sass": "1.89.2",
    "tom-select": "2.4.3",
    "typeface-inter": "3.18.1",
@@ -39,15 +39,15 @@
    "@types/bootstrap": "5.2.10",
    "@types/cookie": "^0.6.0",
    "@types/node": "^22.3.0",
-    "@typescript-eslint/eslint-plugin": "^8.37.0",
-    "@typescript-eslint/parser": "^8.37.0",
-    "esbuild": "^0.25.6",
+    "@typescript-eslint/eslint-plugin": "^8.1.0",
+    "@typescript-eslint/parser": "^8.1.0",
+    "esbuild": "^0.25.3",
    "esbuild-sass-plugin": "^3.3.1",
    "eslint": "<9.0",
    "eslint-config-prettier": "^9.1.0",
    "eslint-import-resolver-typescript": "^3.6.3",
-    "eslint-plugin-import": "^2.32.0",
-    "eslint-plugin-prettier": "^5.5.1",
+    "eslint-plugin-import": "^2.30.0",
+    "eslint-plugin-prettier": "^5.2.1",
    "prettier": "^3.3.3",
    "typescript": "<5.5"
  },
--- a/netbox/project-static/src/racks.ts
+++ b/netbox/project-static/src/racks.ts
@@ -35,7 +35,7 @@ function showRackElements(
  selector: string,
  elevation: HTMLObjectElement,
 ): void {
-  const elements = elevation.querySelectorAll(selector) ?? [];
+  const elements = elevation.contentDocument?.querySelectorAll(selector) ?? [];
  for (const element of elements) {
    element.classList.remove('hidden');
  }
@@ -45,7 +45,7 @@ function hideRackElements(
  selector: string,
  elevation: HTMLObjectElement,
 ): void {
-  const elements = elevation.querySelectorAll(selector) ?? [];
+  const elements = elevation.contentDocument?.querySelectorAll(selector) ?? [];
  for (const element of elements) {
    element.classList.add('hidden');
  }
--- a/netbox/project-static/yarn.lock
+++ b/netbox/project-static/yarn.lock
--- a/netbox/release.yaml
+++ b/netbox/release.yaml
@@ -1,3 +1,3 @@
-version: "4.3.5"
+version: "4.3.3"
 edition: "Community"
-published: "2025-07-29"
+published: "2025-06-26"
--- a/netbox/templates/base/layout.html
+++ b/netbox/templates/base/layout.html
@@ -55,7 +55,7 @@ Blocks:
          {# Release info #}
          <div class="text-muted text-center fs-5 my-3">
            {{ settings.RELEASE.name }}
-            {% if not settings.RELEASE.features.commercial and not settings.ISOLATED_DEPLOYMENT %}
+            {% if not settings.RELEASE.features.commercial %}
              <div>
                <a href="https://netboxlabs.com/netbox-cloud/" class="text-muted">{% trans "Get" %} Cloud</a> |
                <a href="https://netboxlabs.com/netbox-enterprise/" class="text-muted">{% trans "Get" %} Enterprise</a>
@@ -184,7 +184,7 @@ Blocks:
                {% endif %}

                {# Commercial links #}
-                {% if settings.RELEASE.features.commercial and not settings.ISOLATED_DEPLOYMENT %}
+                {% if settings.RELEASE.features.commercial %}
                  {# LinkedIn #}
                  <li class="list-inline-item">
                    <a href="https://www.linkedin.com/company/netboxlabs/" target="_blank" class="link-secondary" rel="noopener" aria-label="LinkedIn">
@@ -199,7 +199,7 @@ Blocks:
                  </li>

                {# Community links #}
-                {% elif not settings.ISOLATED_DEPLOYMENT %}
+                {% else %}
                  {# GitHub #}
                  <li class="list-inline-item">
                    <a href="https://github.com/netbox-community/netbox" target="_blank" class="link-secondary" rel="noopener" aria-label="{% trans "Source Code" %}">
--- a/netbox/templates/dcim/inc/rack_elevation.html
+++ b/netbox/templates/dcim/inc/rack_elevation.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-<div style="margin-left: -30px" class="rack_elevation">
+<div style="margin-left: -30px">
  <div
    hx-get="{% url 'dcim-api:rack-elevation' pk=object.pk %}?face={{ face }}&render=svg{% if extra_params %}&{{ extra_params }}{% endif %}"
    hx-trigger="intersect"
--- a/netbox/templates/extras/customfieldchoiceset.html
+++ b/netbox/templates/extras/customfieldchoiceset.html
@@ -14,7 +14,7 @@
          </tr>
          <tr>
            <th scope="row">Description</th>
-            <td>{{ object.description|placeholder }}</td>
+            <td>{{ object.description|markdown|placeholder }}</td>
          </tr>
          <tr>
            <th scope="row">Base Choices</th>
--- a/netbox/templates/inc/filter_list.html
+++ b/netbox/templates/inc/filter_list.html
@@ -29,7 +29,11 @@
          <div class="hr-text">
            <span>{% trans "Custom Fields" %}</span>
          </div>
-          {% render_custom_fields filter_form %}
+          {% for name in filter_form.custom_fields %}
+            {% with field=filter_form|get_item:name %}
+              {% render_field field %}
+            {% endwith %}
+          {% endfor %}
        </div>
      {% endif %}
    </div>
--- a/netbox/tenancy/forms/bulk_edit.py
+++ b/netbox/tenancy/forms/bulk_edit.py
@@ -45,17 +45,12 @@ class TenantBulkEditForm(NetBoxModelBulkEditForm):
        queryset=TenantGroup.objects.all(),
        required=False
    )
-    description = forms.CharField(
-        label=_('Description'),
-        max_length=200,
-        required=False
-    )

    model = Tenant
    fieldsets = (
-        FieldSet('group', 'description'),
+        FieldSet('group'),
    )
-    nullable_fields = ('group', 'description')
+    nullable_fields = ('group',)


 #
--- a/netbox/tenancy/tables/contacts.py
+++ b/netbox/tenancy/tables/contacts.py
@@ -19,10 +19,6 @@ class ContactGroupTable(NetBoxTable):
        verbose_name=_('Name'),
        linkify=True
    )
-    parent = tables.Column(
-        verbose_name=_('Parent'),
-        linkify=True,
-    )
    contact_count = columns.LinkedCountColumn(
        viewname='tenancy:contact_list',
        url_params={'group_id': 'pk'},
@@ -38,7 +34,7 @@ class ContactGroupTable(NetBoxTable):
    class Meta(NetBoxTable.Meta):
        model = ContactGroup
        fields = (
-            'pk', 'name', 'parent', 'contact_count', 'description', 'comments', 'slug', 'tags', 'created',
+            'pk', 'name', 'contact_count', 'description', 'comments', 'slug', 'tags', 'created',
            'last_updated', 'actions',
        )
        default_columns = ('pk', 'name', 'contact_count', 'description')
--- a/netbox/tenancy/tables/tenants.py
+++ b/netbox/tenancy/tables/tenants.py
@@ -16,10 +16,6 @@ class TenantGroupTable(NetBoxTable):
        verbose_name=_('Name'),
        linkify=True
    )
-    parent = tables.Column(
-        verbose_name=_('Parent'),
-        linkify=True,
-    )
    tenant_count = columns.LinkedCountColumn(
        viewname='tenancy:tenant_list',
        url_params={'group_id': 'pk'},
@@ -35,7 +31,7 @@ class TenantGroupTable(NetBoxTable):
    class Meta(NetBoxTable.Meta):
        model = TenantGroup
        fields = (
-            'pk', 'id', 'name', 'parent', 'tenant_count', 'description', 'comments', 'slug', 'tags', 'created',
+            'pk', 'id', 'name', 'tenant_count', 'description', 'comments', 'slug', 'tags', 'created',
            'last_updated', 'actions',
        )
        default_columns = ('pk', 'name', 'tenant_count', 'description')
--- a/netbox/tenancy/tests/test_views.py
+++ b/netbox/tenancy/tests/test_views.py
@@ -98,7 +98,6 @@ class TenantTestCase(ViewTestCases.PrimaryObjectViewTestCase):

        cls.bulk_edit_data = {
            'group': tenant_groups[1].pk,
-            'description': 'Bulk edit description',
        }


--- a/netbox/translations/cs/LC_MESSAGES/django.mo
+++ b/netbox/translations/cs/LC_MESSAGES/django.mo
--- a/netbox/translations/cs/LC_MESSAGES/django.po
+++ b/netbox/translations/cs/LC_MESSAGES/django.po
--- a/netbox/translations/da/LC_MESSAGES/django.mo
+++ b/netbox/translations/da/LC_MESSAGES/django.mo
--- a/netbox/translations/da/LC_MESSAGES/django.po
+++ b/netbox/translations/da/LC_MESSAGES/django.po
--- a/netbox/translations/de/LC_MESSAGES/django.mo
+++ b/netbox/translations/de/LC_MESSAGES/django.mo
--- a/netbox/translations/de/LC_MESSAGES/django.po
+++ b/netbox/translations/de/LC_MESSAGES/django.po
--- a/netbox/translations/en/LC_MESSAGES/django.po
+++ b/netbox/translations/en/LC_MESSAGES/django.po
--- a/netbox/translations/es/LC_MESSAGES/django.mo
+++ b/netbox/translations/es/LC_MESSAGES/django.mo
--- a/netbox/translations/es/LC_MESSAGES/django.po
+++ b/netbox/translations/es/LC_MESSAGES/django.po
--- a/netbox/translations/fr/LC_MESSAGES/django.mo
+++ b/netbox/translations/fr/LC_MESSAGES/django.mo
--- a/netbox/translations/fr/LC_MESSAGES/django.po
+++ b/netbox/translations/fr/LC_MESSAGES/django.po
--- a/netbox/translations/it/LC_MESSAGES/django.mo
+++ b/netbox/translations/it/LC_MESSAGES/django.mo
--- a/netbox/translations/it/LC_MESSAGES/django.po
+++ b/netbox/translations/it/LC_MESSAGES/django.po
--- a/netbox/translations/ja/LC_MESSAGES/django.mo
+++ b/netbox/translations/ja/LC_MESSAGES/django.mo
--- a/netbox/translations/ja/LC_MESSAGES/django.po
+++ b/netbox/translations/ja/LC_MESSAGES/django.po
--- a/netbox/translations/nl/LC_MESSAGES/django.mo
+++ b/netbox/translations/nl/LC_MESSAGES/django.mo
--- a/netbox/translations/nl/LC_MESSAGES/django.po
+++ b/netbox/translations/nl/LC_MESSAGES/django.po
--- a/netbox/translations/pl/LC_MESSAGES/django.mo
+++ b/netbox/translations/pl/LC_MESSAGES/django.mo
--- a/netbox/translations/pl/LC_MESSAGES/django.po
+++ b/netbox/translations/pl/LC_MESSAGES/django.po
--- a/netbox/translations/pt/LC_MESSAGES/django.mo
+++ b/netbox/translations/pt/LC_MESSAGES/django.mo
--- a/netbox/translations/pt/LC_MESSAGES/django.po
+++ b/netbox/translations/pt/LC_MESSAGES/django.po
--- a/netbox/translations/ru/LC_MESSAGES/django.mo
+++ b/netbox/translations/ru/LC_MESSAGES/django.mo
--- a/netbox/translations/ru/LC_MESSAGES/django.po
+++ b/netbox/translations/ru/LC_MESSAGES/django.po
--- a/netbox/translations/tr/LC_MESSAGES/django.mo
+++ b/netbox/translations/tr/LC_MESSAGES/django.mo
--- a/netbox/translations/tr/LC_MESSAGES/django.po
+++ b/netbox/translations/tr/LC_MESSAGES/django.po
--- a/netbox/translations/uk/LC_MESSAGES/django.mo
+++ b/netbox/translations/uk/LC_MESSAGES/django.mo
--- a/netbox/translations/uk/LC_MESSAGES/django.po
+++ b/netbox/translations/uk/LC_MESSAGES/django.po
--- a/netbox/translations/zh/LC_MESSAGES/django.mo
+++ b/netbox/translations/zh/LC_MESSAGES/django.mo
--- a/netbox/translations/zh/LC_MESSAGES/django.po
+++ b/netbox/translations/zh/LC_MESSAGES/django.po
--- a/netbox/users/migrations/0010_add_token_meta_ordering.py
+++ b/netbox/users/migrations/0010_add_token_meta_ordering.py
@@ -1,17 +0,0 @@
-# Generated by Django 5.2.4 on 2025-07-23 17:28
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('users', '0009_update_group_perms'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='token',
-            options={'ordering': ('-created',)},
-        ),
-    ]
--- a/netbox/users/models/tokens.py
+++ b/netbox/users/models/tokens.py
@@ -74,7 +74,6 @@ class Token(models.Model):
    class Meta:
        verbose_name = _('token')
        verbose_name_plural = _('tokens')
-        ordering = ('-created',)

    def __str__(self):
        return self.key if settings.ALLOW_TOKEN_RETRIEVAL else self.partial
--- a/netbox/utilities/constants.py
+++ b/netbox/utilities/constants.py
@@ -13,8 +13,6 @@ FILTER_CHAR_BASED_LOOKUP_MAP = dict(
    ie='iexact',
    nie='iexact',
    empty='empty',
-    regex='regex',
-    iregex='iregex',
 )

 FILTER_NUMERIC_BASED_LOOKUP_MAP = dict(
--- a/netbox/utilities/query.py
+++ b/netbox/utilities/query.py
@@ -67,8 +67,5 @@ def reapply_model_ordering(queryset: QuerySet) -> QuerySet:
    # MPTT-based models are exempt from this; use caution when annotating querysets of these models
    if any(isinstance(manager, TreeManager) for manager in queryset.model._meta.local_managers):
        return queryset
-    elif queryset.ordered:
-        return queryset
-
    ordering = queryset.model._meta.ordering
    return queryset.order_by(*ordering)
--- a/netbox/utilities/tests/test_filters.py
+++ b/netbox/utilities/tests/test_filters.py
@@ -180,10 +180,6 @@ class BaseFilterSetTest(TestCase):
        self.assertEqual(self.filters['charfield__niew'].exclude, True)
        self.assertEqual(self.filters['charfield__empty'].lookup_expr, 'empty')
        self.assertEqual(self.filters['charfield__empty'].exclude, False)
-        self.assertEqual(self.filters['charfield__regex'].lookup_expr, 'regex')
-        self.assertEqual(self.filters['charfield__regex'].exclude, False)
-        self.assertEqual(self.filters['charfield__iregex'].lookup_expr, 'iregex')
-        self.assertEqual(self.filters['charfield__iregex'].exclude, False)

    def test_number_filter(self):
        self.assertIsInstance(self.filters['numberfield'], django_filters.NumberFilter)
@@ -224,10 +220,6 @@ class BaseFilterSetTest(TestCase):
        self.assertEqual(self.filters['macaddressfield__iew'].exclude, False)
        self.assertEqual(self.filters['macaddressfield__niew'].lookup_expr, 'iendswith')
        self.assertEqual(self.filters['macaddressfield__niew'].exclude, True)
-        self.assertEqual(self.filters['macaddressfield__regex'].lookup_expr, 'regex')
-        self.assertEqual(self.filters['macaddressfield__regex'].exclude, False)
-        self.assertEqual(self.filters['macaddressfield__iregex'].lookup_expr, 'iregex')
-        self.assertEqual(self.filters['macaddressfield__iregex'].exclude, False)

    def test_model_choice_filter(self):
        self.assertIsInstance(self.filters['modelchoicefield'], django_filters.ModelChoiceFilter)
@@ -265,10 +257,6 @@ class BaseFilterSetTest(TestCase):
        self.assertEqual(self.filters['multivaluecharfield__iew'].exclude, False)
        self.assertEqual(self.filters['multivaluecharfield__niew'].lookup_expr, 'iendswith')
        self.assertEqual(self.filters['multivaluecharfield__niew'].exclude, True)
-        self.assertEqual(self.filters['multivaluecharfield__regex'].lookup_expr, 'regex')
-        self.assertEqual(self.filters['multivaluecharfield__regex'].exclude, False)
-        self.assertEqual(self.filters['multivaluecharfield__iregex'].lookup_expr, 'iregex')
-        self.assertEqual(self.filters['multivaluecharfield__iregex'].exclude, False)

    def test_multi_value_date_filter(self):
        self.assertIsInstance(self.filters['datefield'], MultiValueDateFilter)
@@ -352,10 +340,6 @@ class BaseFilterSetTest(TestCase):
        self.assertEqual(self.filters['multiplechoicefield__iew'].exclude, False)
        self.assertEqual(self.filters['multiplechoicefield__niew'].lookup_expr, 'iendswith')
        self.assertEqual(self.filters['multiplechoicefield__niew'].exclude, True)
-        self.assertEqual(self.filters['multiplechoicefield__regex'].lookup_expr, 'regex')
-        self.assertEqual(self.filters['multiplechoicefield__regex'].exclude, False)
-        self.assertEqual(self.filters['multiplechoicefield__iregex'].lookup_expr, 'iregex')
-        self.assertEqual(self.filters['multiplechoicefield__iregex'].exclude, False)

    def test_tag_filter(self):
        self.assertIsInstance(self.filters['tagfield'], TagFilter)
@@ -550,14 +534,6 @@ class DynamicFilterLookupExpressionTest(TestCase):
        params = {'slug__niew': ['-1']}
        self.assertEqual(SiteFilterSet(params, Site.objects.all()).qs.count(), 2)

-    def test_site_slug_regex(self):
-        params = {'slug__regex': ['^def-[a-z]*-2$']}
-        self.assertEqual(SiteFilterSet(params, Site.objects.all()).qs.count(), 1)
-
-    def test_site_slug_iregex(self):
-        params = {'slug__iregex': ['^DEF-[a-z]*-2$']}
-        self.assertEqual(SiteFilterSet(params, Site.objects.all()).qs.count(), 1)
-
    def test_provider_asn_lt(self):
        params = {'asn__lt': [65101]}
        self.assertEqual(ASNFilterSet(params, ASN.objects.all()).qs.count(), 1)
@@ -642,14 +618,6 @@ class DynamicFilterLookupExpressionTest(TestCase):
        params = {'mac_address__nic': ['aa:', 'bb']}
        self.assertEqual(DeviceFilterSet(params, Device.objects.all()).qs.count(), 1)

-    def test_device_mac_address_regex(self):
-        params = {'mac_address__regex': ['^cc.*:03$']}
-        self.assertEqual(DeviceFilterSet(params, Device.objects.all()).qs.count(), 1)
-
-    def test_device_mac_address_iregex(self):
-        params = {'mac_address__iregex': ['^CC.*:03$']}
-        self.assertEqual(DeviceFilterSet(params, Device.objects.all()).qs.count(), 1)
-
    def test_interface_rf_role_empty(self):
        params = {'rf_role__empty': 'true'}
        self.assertEqual(InterfaceFilterSet(params, Interface.objects.all()).qs.count(), 5)
--- a/netbox/wireless/tables/wirelesslan.py
+++ b/netbox/wireless/tables/wirelesslan.py
@@ -18,10 +18,6 @@ class WirelessLANGroupTable(NetBoxTable):
        verbose_name=_('Name'),
        linkify=True
    )
-    parent = tables.Column(
-        verbose_name=_('Parent'),
-        linkify=True,
-    )
    wirelesslan_count = columns.LinkedCountColumn(
        viewname='wireless:wirelesslan_list',
        url_params={'group_id': 'pk'},
@@ -37,8 +33,8 @@ class WirelessLANGroupTable(NetBoxTable):
    class Meta(NetBoxTable.Meta):
        model = WirelessLANGroup
        fields = (
-            'pk', 'name', 'parent', 'slug', 'description', 'comments', 'tags', 'wirelesslan_count', 'created',
-            'last_updated', 'actions',
+            'pk', 'name', 'wirelesslan_count', 'slug', 'description', 'comments', 'tags', 'created', 'last_updated',
+            'actions',
        )
        default_columns = ('pk', 'name', 'wirelesslan_count', 'description')

--- a/pyproject.toml
+++ b/pyproject.toml
@@ -3,7 +3,7 @@

 [project]
 name = "netbox"
-version = "4.3.5"
+version = "4.3.3"
 requires-python = ">=3.10"
 authors = [
    { name = "NetBox Community" }
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,9 +1,9 @@
-Django==5.2.4
+Django==5.2.3
 django-cors-headers==4.7.0
 django-debug-toolbar==5.2.0
 django-filter==25.1
+django-htmx==1.23.1
 django-graphiql-debug-toolbar==0.2.0
-django-htmx==1.23.2
 django-mptt==0.17.0
 django-pglocks==1.0.4
 django-prometheus==2.4.1
@@ -11,30 +11,30 @@ django-redis==6.0.0
 django-rich==2.0.0
 django-rq==3.0.1
 django-storages==1.14.6
-django-tables2==2.7.5
 django-taggit==6.1.0
+django-tables2==2.7.5
 django-timezone-field==7.1
 djangorestframework==3.16.0
 drf-spectacular==0.28.0
-drf-spectacular-sidecar==2025.7.1
+drf-spectacular-sidecar==2025.6.1
 feedparser==6.0.11
 gunicorn==23.0.0
 Jinja2==3.1.6
-jsonschema==4.25.0
+jsonschema==4.24.0
 Markdown==3.8.2
-mkdocs-material==9.6.16
-mkdocstrings[python]==0.30.0
+mkdocs-material==9.6.14
+mkdocstrings[python]==0.29.1
 netaddr==1.3.0
-nh3==0.3.0
-Pillow==11.3.0
+nh3==0.2.21
+Pillow==11.2.1
 psycopg[c,pool]==3.2.9
 PyYAML==6.0.2
 requests==2.32.4
-rq==2.4.1
-social-auth-app-django==5.5.1
-social-auth-core==4.7.0
-strawberry-graphql==0.278.0
-strawberry-graphql-django==0.65.1
+rq==2.4.0
+social-auth-app-django==5.4.3
+social-auth-core==4.6.1
+strawberry-graphql==0.275.4
+strawberry-graphql-django==0.60.0
 svgwrite==1.4.3
 tablib==3.8.0
 tzdata==2025.2
Author	SHA1	Message	Date
Brian Tiemann	0c95ac6b1a	Make url a property on MenuItem/PluginMenuItem etc, overridable via a setter Some checks failed CI / build (20.x, 3.10) (push) Has been cancelled Details CI / build (20.x, 3.11) (push) Has been cancelled Details CI / build (20.x, 3.12) (push) Has been cancelled Details	2025-07-13 20:19:46 -04:00
Brian Tiemann	7338898ccb	Back out support for callables but keep alternate prerendered url param	2025-07-08 15:38:12 -04:00
Brian Tiemann	aa4533e331	Merge branch 'main' into nav-menu-callables	2025-07-08 15:32:38 -04:00
Brian Tiemann	e400a7cb29	Merge remote-tracking branch 'origin/nav-menu-callables' into nav-menu-callables	2025-07-07 19:30:03 -04:00
btiemann	600f85ca83	Clarify docstring to differentiate link and url	2025-06-30 14:26:43 -04:00
Brian Tiemann	9d6abcf57b	Merge branch 'main' into nav-menu-callables	2025-06-12 16:42:50 -04:00
Brian Tiemann	fbf639fad1	Merge branch 'main' into nav-menu-callables	2025-06-10 08:50:44 -04:00
Brian Tiemann	9a46c8e30d	Merge branch 'main' into nav-menu-callables	2025-05-21 20:25:46 -04:00
Brian Tiemann	4ca48843af	Fix quote on add button	2025-05-09 18:17:56 -04:00
Brian Tiemann	874d020d57	Merge branch 'main' into nav-menu-callables	2025-05-01 14:52:32 -04:00
Brian Tiemann	d0129811e2	Support menu items that are callables	2025-04-29 19:11:55 -04:00