Fixes #21176 : Remove checkboxes from IP ranges in mixed-type tables

When IP addresses and IP ranges are displayed together in a prefix's IP Addresses tab, only IP addresses should be selectable for bulk operations since the bulk delete form doesn't support mixed object types. - Override render_pk() in AnnotatedIPAddressTable to conditionally render checkboxes only for the table's primary model type (IPAddress) - Add warning comment to add_requested_prefixes() about fake Prefix objects - Add regression test to verify IPAddress has checkboxes but IPRange does not
Fixes #21214 : Clean up AutoSyncRecord when detaching from DataSource (#21219 )
2026-01-23 12:08:43 -06:00 · 2026-01-23 09:36:15 -06:00 · 2026-01-21 16:38:27 -06:00 · 2026-01-21 16:34:01 -06:00
31 changed files with 270 additions and 430 deletions
--- a/.github/ISSUE_TEMPLATE/03-performance.yaml
+++ b/.github/ISSUE_TEMPLATE/03-performance.yaml
@@ -0,0 +1,43 @@
+---
+name: 🏁 Performance
+type: Performance
+description: An opportunity to improve application performance
+labels: ["netbox", "type: performance", "status: needs triage"]
+body:
+  - type: input
+    attributes:
+      label: NetBox Version
+      description: What version of NetBox are you currently running?
+      placeholder: v4.5.1
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Python Version
+      description: What version of Python are you currently running?
+      options:
+        - "3.12"
+        - "3.13"
+        - "3.14"
+    validations:
+      required: true
+  - type: checkboxes
+    attributes:
+      label: Area(s) of Concern
+      description: Which application interface(s) are affected?
+      options:
+        - label: User Interface
+        - label: REST API
+        - label: GraphQL API
+        - label: Python ORM
+        - label: Other
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Details
+      description: >
+        Describe in detail the operations being performed and the indications of a performance issue.
+        Include any relevant testing parameters, benchmarks, and expected results.
+    validations:
+      required: true
--- a/.github/ISSUE_TEMPLATE/04-documentation_change.yaml
+++ b/.github/ISSUE_TEMPLATE/04-documentation_change.yaml
--- a/.github/ISSUE_TEMPLATE/05-translation.yaml
+++ b/.github/ISSUE_TEMPLATE/05-translation.yaml
--- a/.github/ISSUE_TEMPLATE/06-housekeeping.yaml
+++ b/.github/ISSUE_TEMPLATE/06-housekeeping.yaml
--- a/.github/ISSUE_TEMPLATE/07-deprecation.yaml
+++ b/.github/ISSUE_TEMPLATE/07-deprecation.yaml
--- a/.github/ISSUE_TEMPLATE/08-feature_removal.yaml
+++ b/.github/ISSUE_TEMPLATE/08-feature_removal.yaml
--- a/netbox/circuits/forms/filtersets.py
+++ b/netbox/circuits/forms/filtersets.py
@@ -34,10 +34,9 @@ __all__ = (
 class ProviderFilterForm(ContactModelFilterForm, PrimaryModelFilterSetForm):
    model = Provider
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('region_id', 'site_group_id', 'site_id', name=_('Location')),
        FieldSet('asn_id', name=_('ASN')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
        FieldSet('contact', 'contact_role', 'contact_group', name=_('Contacts')),
    )
    region_id = DynamicModelMultipleChoiceField(
@@ -70,9 +69,8 @@ class ProviderFilterForm(ContactModelFilterForm, PrimaryModelFilterSetForm):
 class ProviderAccountFilterForm(ContactModelFilterForm, PrimaryModelFilterSetForm):
    model = ProviderAccount
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('provider_id', 'account', name=_('Attributes')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
        FieldSet('contact', 'contact_role', 'contact_group', name=_('Contacts')),
    )
    provider_id = DynamicModelMultipleChoiceField(
@@ -90,9 +88,8 @@ class ProviderAccountFilterForm(ContactModelFilterForm, PrimaryModelFilterSetFor
 class ProviderNetworkFilterForm(PrimaryModelFilterSetForm):
    model = ProviderNetwork
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('provider_id', 'service_id', name=_('Attributes')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    provider_id = DynamicModelMultipleChoiceField(
        queryset=Provider.objects.all(),
@@ -110,9 +107,8 @@ class ProviderNetworkFilterForm(PrimaryModelFilterSetForm):
 class CircuitTypeFilterForm(OrganizationalModelFilterSetForm):
    model = CircuitType
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('color', name=_('Attributes')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    tag = TagFilterField(model)

@@ -125,7 +121,7 @@ class CircuitTypeFilterForm(OrganizationalModelFilterSetForm):
 class CircuitFilterForm(TenancyFilterForm, ContactModelFilterForm, PrimaryModelFilterSetForm):
    model = Circuit
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('provider_id', 'provider_account_id', 'provider_network_id', name=_('Provider')),
        FieldSet(
            'type_id', 'status', 'install_date', 'termination_date', 'commit_rate', 'distance', 'distance_unit',
@@ -133,7 +129,6 @@ class CircuitFilterForm(TenancyFilterForm, ContactModelFilterForm, PrimaryModelF
        ),
        FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', name=_('Location')),
        FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
        FieldSet('contact', 'contact_role', 'contact_group', name=_('Contacts')),
    )
    selector_fields = ('filter_id', 'q', 'region_id', 'site_group_id', 'site_id', 'provider_id', 'provider_network_id')
@@ -279,9 +274,8 @@ class CircuitTerminationFilterForm(NetBoxModelFilterSetForm):
 class CircuitGroupFilterForm(TenancyFilterForm, OrganizationalModelFilterSetForm):
    model = CircuitGroup
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    tag = TagFilterField(model)

@@ -318,9 +312,8 @@ class CircuitGroupAssignmentFilterForm(NetBoxModelFilterSetForm):
 class VirtualCircuitTypeFilterForm(OrganizationalModelFilterSetForm):
    model = VirtualCircuitType
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('color', name=_('Attributes')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    tag = TagFilterField(model)

@@ -333,11 +326,10 @@ class VirtualCircuitTypeFilterForm(OrganizationalModelFilterSetForm):
 class VirtualCircuitFilterForm(TenancyFilterForm, ContactModelFilterForm, PrimaryModelFilterSetForm):
    model = VirtualCircuit
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('provider_id', 'provider_account_id', 'provider_network_id', name=_('Provider')),
        FieldSet('type_id', 'status', name=_('Attributes')),
        FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    selector_fields = ('filter_id', 'q', 'provider_id', 'provider_network_id')
    provider_id = DynamicModelMultipleChoiceField(
--- a/netbox/core/forms/filtersets.py
+++ b/netbox/core/forms/filtersets.py
@@ -26,9 +26,8 @@ __all__ = (
 class DataSourceFilterForm(PrimaryModelFilterSetForm):
    model = DataSource
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('type', 'status', 'enabled', 'sync_interval', name=_('Data Source')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    type = forms.MultipleChoiceField(
        label=_('Type'),
--- a/netbox/dcim/forms/filtersets.py
+++ b/netbox/dcim/forms/filtersets.py
@@ -14,9 +14,9 @@ from netbox.forms import (
 )
 from tenancy.forms import ContactModelFilterForm, TenancyFilterForm
 from tenancy.models import Tenant
-from users.models import OwnerGroup, Owner, User
+from users.models import Owner, User
 from utilities.forms import BOOLEAN_WITH_BLANK_CHOICES, FilterForm, add_blank_choice
-from utilities.forms.fields import ColorField, DynamicModelMultipleChoiceField, TagFilterField
+from utilities.forms.fields import ColorField, DynamicModelChoiceField, DynamicModelMultipleChoiceField, TagFilterField
 from utilities.forms.rendering import FieldSet
 from utilities.forms.widgets import NumberWithOptions
 from virtualization.models import Cluster, ClusterGroup, VirtualMachine
@@ -70,7 +70,7 @@ __all__ = (
    'SiteFilterForm',
    'SiteGroupFilterForm',
    'VirtualChassisFilterForm',
-    'VirtualDeviceContextFilterForm',
+    'VirtualDeviceContextFilterForm'
 )


@@ -157,19 +157,9 @@ class DeviceComponentFilterForm(NetBoxModelFilterSetForm):
        required=False,
        label=_('Device Status'),
    )
-    owner_group_id = DynamicModelMultipleChoiceField(
-        queryset=OwnerGroup.objects.all(),
-        required=False,
-        null_option='None',
-        label=_('Owner Group'),
-    )
-    owner_id = DynamicModelMultipleChoiceField(
+    owner_id = DynamicModelChoiceField(
        queryset=Owner.objects.all(),
        required=False,
-        null_option='None',
-        query_params={
-            'group_id': '$owner_group_id'
-        },
        label=_('Owner'),
    )

@@ -177,9 +167,8 @@ class DeviceComponentFilterForm(NetBoxModelFilterSetForm):
 class RegionFilterForm(ContactModelFilterForm, NestedGroupModelFilterSetForm):
    model = Region
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('parent_id', name=_('Region')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
        FieldSet('contact', 'contact_role', 'contact_group', name=_('Contacts'))
    )
    parent_id = DynamicModelMultipleChoiceField(
@@ -193,9 +182,8 @@ class RegionFilterForm(ContactModelFilterForm, NestedGroupModelFilterSetForm):
 class SiteGroupFilterForm(ContactModelFilterForm, NestedGroupModelFilterSetForm):
    model = SiteGroup
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('parent_id', name=_('Site Group')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
        FieldSet('contact', 'contact_role', 'contact_group', name=_('Contacts'))
    )
    parent_id = DynamicModelMultipleChoiceField(
@@ -209,10 +197,9 @@ class SiteGroupFilterForm(ContactModelFilterForm, NestedGroupModelFilterSetForm)
 class SiteFilterForm(TenancyFilterForm, ContactModelFilterForm, PrimaryModelFilterSetForm):
    model = Site
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('status', 'region_id', 'group_id', 'asn_id', name=_('Attributes')),
        FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
        FieldSet('contact', 'contact_role', 'contact_group', name=_('Contacts')),
    )
    selector_fields = ('filter_id', 'q', 'region_id', 'group_id')
@@ -242,10 +229,9 @@ class SiteFilterForm(TenancyFilterForm, ContactModelFilterForm, PrimaryModelFilt
 class LocationFilterForm(TenancyFilterForm, ContactModelFilterForm, NestedGroupModelFilterSetForm):
    model = Location
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('region_id', 'site_group_id', 'site_id', 'parent_id', 'status', 'facility', name=_('Attributes')),
        FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
        FieldSet('contact', 'contact_role', 'contact_group', name=_('Contacts')),
    )
    region_id = DynamicModelMultipleChoiceField(
@@ -291,8 +277,7 @@ class LocationFilterForm(TenancyFilterForm, ContactModelFilterForm, NestedGroupM
 class RackRoleFilterForm(OrganizationalModelFilterSetForm):
    model = RackRole
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
    )
    tag = TagFilterField(model)

@@ -343,11 +328,10 @@ class RackBaseFilterForm(PrimaryModelFilterSetForm):
 class RackTypeFilterForm(RackBaseFilterForm):
    model = RackType
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('manufacturer_id', 'form_factor', 'width', 'u_height', 'rack_count', name=_('Rack Type')),
        FieldSet('starting_unit', 'desc_units', name=_('Numbering')),
        FieldSet('weight', 'max_weight', 'weight_unit', name=_('Weight')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    selector_fields = ('filter_id', 'q', 'manufacturer_id')
    manufacturer_id = DynamicModelMultipleChoiceField(
@@ -366,14 +350,13 @@ class RackTypeFilterForm(RackBaseFilterForm):
 class RackFilterForm(TenancyFilterForm, ContactModelFilterForm, RackBaseFilterForm):
    model = Rack
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', name=_('Location')),
+        FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
        FieldSet('status', 'role_id', 'manufacturer_id', 'rack_type_id', 'serial', 'asset_tag', name=_('Rack')),
        FieldSet('form_factor', 'width', 'u_height', 'airflow', name=_('Hardware')),
        FieldSet('starting_unit', 'desc_units', name=_('Numbering')),
        FieldSet('weight', 'max_weight', 'weight_unit', name=_('Weight')),
-        FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
        FieldSet('contact', 'contact_role', 'contact_group', name=_('Contacts')),
    )
    selector_fields = ('filter_id', 'q', 'region_id', 'site_group_id', 'site_id', 'location_id')
@@ -450,10 +433,9 @@ class RackElevationFilterForm(RackFilterForm):
        FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', 'id', name=_('Location')),
        FieldSet('status', 'role_id', name=_('Function')),
        FieldSet('type', 'width', 'serial', 'asset_tag', name=_('Hardware')),
-        FieldSet('weight', 'max_weight', 'weight_unit', name=_('Weight')),
        FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
        FieldSet('contact', 'contact_role', 'contact_group', name=_('Contacts')),
+        FieldSet('weight', 'max_weight', 'weight_unit', name=_('Weight')),
    )
    id = DynamicModelMultipleChoiceField(
        queryset=Rack.objects.all(),
@@ -469,11 +451,10 @@ class RackElevationFilterForm(RackFilterForm):
 class RackReservationFilterForm(TenancyFilterForm, PrimaryModelFilterSetForm):
    model = RackReservation
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('status', 'user_id', name=_('Reservation')),
        FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', name=_('Rack')),
        FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    region_id = DynamicModelMultipleChoiceField(
        queryset=Region.objects.all(),
@@ -528,8 +509,7 @@ class RackReservationFilterForm(TenancyFilterForm, PrimaryModelFilterSetForm):
 class ManufacturerFilterForm(ContactModelFilterForm, OrganizationalModelFilterSetForm):
    model = Manufacturer
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('contact', 'contact_role', 'contact_group', name=_('Contacts'))
    )
    tag = TagFilterField(model)
@@ -538,7 +518,7 @@ class ManufacturerFilterForm(ContactModelFilterForm, OrganizationalModelFilterSe
 class DeviceTypeFilterForm(PrimaryModelFilterSetForm):
    model = DeviceType
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet(
            'manufacturer_id', 'default_platform_id', 'part_number', 'device_count',
            'subdevice_role', 'airflow', name=_('Hardware')
@@ -549,7 +529,6 @@ class DeviceTypeFilterForm(PrimaryModelFilterSetForm):
            'pass_through_ports', 'device_bays', 'module_bays', 'inventory_items', name=_('Components')
        ),
        FieldSet('weight', 'weight_unit', name=_('Weight')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    selector_fields = ('filter_id', 'q', 'manufacturer_id')
    manufacturer_id = DynamicModelMultipleChoiceField(
@@ -673,8 +652,7 @@ class DeviceTypeFilterForm(PrimaryModelFilterSetForm):
 class ModuleTypeProfileFilterForm(PrimaryModelFilterSetForm):
    model = ModuleTypeProfile
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
    )
    selector_fields = ('filter_id', 'q')
    tag = TagFilterField(model)
@@ -683,7 +661,7 @@ class ModuleTypeProfileFilterForm(PrimaryModelFilterSetForm):
 class ModuleTypeFilterForm(PrimaryModelFilterSetForm):
    model = ModuleType
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet(
            'profile_id', 'manufacturer_id', 'part_number', 'module_count',
            'airflow', name=_('Hardware')
@@ -693,7 +671,6 @@ class ModuleTypeFilterForm(PrimaryModelFilterSetForm):
            'pass_through_ports', name=_('Components')
        ),
        FieldSet('weight', 'weight_unit', name=_('Weight')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    selector_fields = ('filter_id', 'q', 'manufacturer_id')
    profile_id = DynamicModelMultipleChoiceField(
@@ -777,9 +754,8 @@ class ModuleTypeFilterForm(PrimaryModelFilterSetForm):
 class DeviceRoleFilterForm(NestedGroupModelFilterSetForm):
    model = DeviceRole
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
-        FieldSet('parent_id', 'config_template_id', name=_('Device Role')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
+        FieldSet('parent_id', 'config_template_id', name=_('Device Role'))
    )
    config_template_id = DynamicModelMultipleChoiceField(
        queryset=ConfigTemplate.objects.all(),
@@ -797,9 +773,8 @@ class DeviceRoleFilterForm(NestedGroupModelFilterSetForm):
 class PlatformFilterForm(NestedGroupModelFilterSetForm):
    model = Platform
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
-        FieldSet('manufacturer_id', 'parent_id', 'config_template_id', name=_('Platform')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
+        FieldSet('manufacturer_id', 'parent_id', 'config_template_id', name=_('Platform'))
    )
    selector_fields = ('filter_id', 'q', 'manufacturer_id')
    parent_id = DynamicModelMultipleChoiceField(
@@ -828,12 +803,11 @@ class DeviceFilterForm(
 ):
    model = Device
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', name=_('Location')),
        FieldSet('status', 'role_id', 'airflow', 'serial', 'asset_tag', 'mac_address', name=_('Operation')),
        FieldSet('manufacturer_id', 'device_type_id', 'platform_id', name=_('Hardware')),
        FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
        FieldSet('contact', 'contact_role', 'contact_group', name=_('Contacts')),
        FieldSet(
            'console_ports', 'console_server_ports', 'power_ports', 'power_outlets', 'interfaces', 'pass_through_ports',
@@ -1022,10 +996,9 @@ class DeviceFilterForm(
 class VirtualDeviceContextFilterForm(TenancyFilterForm, PrimaryModelFilterSetForm):
    model = VirtualDeviceContext
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('device', 'status', 'has_primary_ip', name=_('Attributes')),
        FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    device = DynamicModelMultipleChoiceField(
        queryset=Device.objects.all(),
@@ -1050,10 +1023,9 @@ class VirtualDeviceContextFilterForm(TenancyFilterForm, PrimaryModelFilterSetFor
 class ModuleFilterForm(LocalConfigContextFilterForm, TenancyFilterForm, PrimaryModelFilterSetForm):
    model = Module
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', 'device_id', name=_('Location')),
        FieldSet('manufacturer_id', 'module_type_id', 'status', 'serial', 'asset_tag', name=_('Hardware')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    device_id = DynamicModelMultipleChoiceField(
        queryset=Device.objects.all(),
@@ -1134,10 +1106,9 @@ class ModuleFilterForm(LocalConfigContextFilterForm, TenancyFilterForm, PrimaryM
 class VirtualChassisFilterForm(TenancyFilterForm, PrimaryModelFilterSetForm):
    model = VirtualChassis
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('region_id', 'site_group_id', 'site_id', name=_('Location')),
-        FieldSet('tenant_id', name=_('Tenant')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
+        FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
    )
    region_id = DynamicModelMultipleChoiceField(
        queryset=Region.objects.all(),
@@ -1164,11 +1135,10 @@ class VirtualChassisFilterForm(TenancyFilterForm, PrimaryModelFilterSetForm):
 class CableFilterForm(TenancyFilterForm, PrimaryModelFilterSetForm):
    model = Cable
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('site_id', 'location_id', 'rack_id', 'device_id', name=_('Location')),
        FieldSet('type', 'status', 'profile', 'color', 'length', 'length_unit', 'unterminated', name=_('Attributes')),
        FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    region_id = DynamicModelMultipleChoiceField(
        queryset=Region.objects.all(),
@@ -1254,9 +1224,8 @@ class CableFilterForm(TenancyFilterForm, PrimaryModelFilterSetForm):
 class PowerPanelFilterForm(ContactModelFilterForm, PrimaryModelFilterSetForm):
    model = PowerPanel
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', name=_('Location')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
        FieldSet('contact', 'contact_role', 'contact_group', name=_('Contacts')),
    )
    selector_fields = ('filter_id', 'q', 'site_id', 'location_id')
@@ -1294,11 +1263,10 @@ class PowerPanelFilterForm(ContactModelFilterForm, PrimaryModelFilterSetForm):
 class PowerFeedFilterForm(TenancyFilterForm, PrimaryModelFilterSetForm):
    model = PowerFeed
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('region_id', 'site_group_id', 'site_id', 'power_panel_id', 'rack_id', name=_('Location')),
-        FieldSet('status', 'type', 'supply', 'phase', 'voltage', 'amperage', 'max_utilization', name=_('Attributes')),
        FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
+        FieldSet('status', 'type', 'supply', 'phase', 'voltage', 'amperage', 'max_utilization', name=_('Attributes')),
    )
    region_id = DynamicModelMultipleChoiceField(
        queryset=Region.objects.all(),
@@ -1422,7 +1390,7 @@ class PathEndpointFilterForm(CabledFilterForm):
 class ConsolePortFilterForm(PathEndpointFilterForm, DeviceComponentFilterForm):
    model = ConsolePort
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('name', 'label', 'type', 'speed', name=_('Attributes')),
        FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', name=_('Location')),
        FieldSet(
@@ -1430,7 +1398,6 @@ class ConsolePortFilterForm(PathEndpointFilterForm, DeviceComponentFilterForm):
            name=_('Device')
        ),
        FieldSet('cabled', 'connected', 'occupied', name=_('Connection')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    type = forms.MultipleChoiceField(
        label=_('Type'),
@@ -1462,7 +1429,7 @@ class ConsolePortTemplateFilterForm(ModularDeviceComponentTemplateFilterForm):
 class ConsoleServerPortFilterForm(PathEndpointFilterForm, DeviceComponentFilterForm):
    model = ConsoleServerPort
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('name', 'label', 'type', 'speed', name=_('Attributes')),
        FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', name=_('Location')),
        FieldSet(
@@ -1470,7 +1437,6 @@ class ConsoleServerPortFilterForm(PathEndpointFilterForm, DeviceComponentFilterF
            name=_('Device')
        ),
        FieldSet('cabled', 'connected', 'occupied', name=_('Connection')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    type = forms.MultipleChoiceField(
        label=_('Type'),
@@ -1502,7 +1468,7 @@ class ConsoleServerPortTemplateFilterForm(ModularDeviceComponentTemplateFilterFo
 class PowerPortFilterForm(PathEndpointFilterForm, DeviceComponentFilterForm):
    model = PowerPort
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('name', 'label', 'type', name=_('Attributes')),
        FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', name=_('Location')),
        FieldSet(
@@ -1510,7 +1476,6 @@ class PowerPortFilterForm(PathEndpointFilterForm, DeviceComponentFilterForm):
            name=_('Device')
        ),
        FieldSet('cabled', 'connected', 'occupied', name=_('Connection')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    type = forms.MultipleChoiceField(
        label=_('Type'),
@@ -1537,7 +1502,7 @@ class PowerPortTemplateFilterForm(ModularDeviceComponentTemplateFilterForm):
 class PowerOutletFilterForm(PathEndpointFilterForm, DeviceComponentFilterForm):
    model = PowerOutlet
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('name', 'label', 'type', 'color', 'status', name=_('Attributes')),
        FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', name=_('Location')),
        FieldSet(
@@ -1545,7 +1510,6 @@ class PowerOutletFilterForm(PathEndpointFilterForm, DeviceComponentFilterForm):
            name=_('Device')
        ),
        FieldSet('cabled', 'connected', 'occupied', name=_('Connection')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    type = forms.MultipleChoiceField(
        label=_('Type'),
@@ -1581,7 +1545,7 @@ class PowerOutletTemplateFilterForm(ModularDeviceComponentTemplateFilterForm):
 class InterfaceFilterForm(PathEndpointFilterForm, DeviceComponentFilterForm):
    model = Interface
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('name', 'label', 'kind', 'type', 'speed', 'duplex', 'enabled', 'mgmt_only', name=_('Attributes')),
        FieldSet('vrf_id', 'l2vpn_id', 'mac_address', 'wwn', name=_('Addressing')),
        FieldSet('poe_mode', 'poe_type', name=_('PoE')),
@@ -1594,7 +1558,6 @@ class InterfaceFilterForm(PathEndpointFilterForm, DeviceComponentFilterForm):
            name=_('Device')
        ),
        FieldSet('cabled', 'connected', 'occupied', name=_('Connection')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    selector_fields = ('filter_id', 'q', 'device_id')
    vdc_id = DynamicModelMultipleChoiceField(
@@ -1753,7 +1716,7 @@ class InterfaceTemplateFilterForm(ModularDeviceComponentTemplateFilterForm):

 class FrontPortFilterForm(CabledFilterForm, DeviceComponentFilterForm):
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('name', 'label', 'type', 'color', name=_('Attributes')),
        FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', name=_('Location')),
        FieldSet(
@@ -1761,7 +1724,6 @@ class FrontPortFilterForm(CabledFilterForm, DeviceComponentFilterForm):
            name=_('Device')
        ),
        FieldSet('cabled', 'occupied', name=_('Cable')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    model = FrontPort
    type = forms.MultipleChoiceField(
@@ -1797,7 +1759,7 @@ class FrontPortTemplateFilterForm(ModularDeviceComponentTemplateFilterForm):
 class RearPortFilterForm(CabledFilterForm, DeviceComponentFilterForm):
    model = RearPort
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('name', 'label', 'type', 'color', name=_('Attributes')),
        FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', name=_('Location')),
        FieldSet(
@@ -1805,7 +1767,6 @@ class RearPortFilterForm(CabledFilterForm, DeviceComponentFilterForm):
            name=_('Device')
        ),
        FieldSet('cabled', 'occupied', name=_('Cable')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    type = forms.MultipleChoiceField(
        label=_('Type'),
@@ -1840,14 +1801,13 @@ class RearPortTemplateFilterForm(ModularDeviceComponentTemplateFilterForm):
 class ModuleBayFilterForm(DeviceComponentFilterForm):
    model = ModuleBay
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('name', 'label', 'position', name=_('Attributes')),
        FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', name=_('Location')),
        FieldSet(
            'tenant_id', 'device_type_id', 'device_role_id', 'device_id', 'device_status', 'virtual_chassis_id',
            name=_('Device')
        ),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    tag = TagFilterField(model)
    position = forms.CharField(
@@ -1872,14 +1832,13 @@ class ModuleBayTemplateFilterForm(ModularDeviceComponentTemplateFilterForm):
 class DeviceBayFilterForm(DeviceComponentFilterForm):
    model = DeviceBay
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('name', 'label', name=_('Attributes')),
        FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', name=_('Location')),
        FieldSet(
            'tenant_id', 'device_type_id', 'device_role_id', 'device_id', 'device_status', 'virtual_chassis_id',
            name=_('Device')
        ),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    tag = TagFilterField(model)

@@ -1896,7 +1855,7 @@ class DeviceBayTemplateFilterForm(DeviceComponentTemplateFilterForm):
 class InventoryItemFilterForm(DeviceComponentFilterForm):
    model = InventoryItem
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet(
            'name', 'label', 'status', 'role_id', 'manufacturer_id', 'serial', 'asset_tag', 'discovered',
            name=_('Attributes')
@@ -1906,7 +1865,6 @@ class InventoryItemFilterForm(DeviceComponentFilterForm):
            'tenant_id', 'device_type_id', 'device_role_id', 'device_id', 'device_status', 'virtual_chassis_id',
            name=_('Device')
        ),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    role_id = DynamicModelMultipleChoiceField(
        queryset=InventoryItemRole.objects.all(),
@@ -1967,8 +1925,7 @@ class InventoryItemTemplateFilterForm(DeviceComponentTemplateFilterForm):
 class InventoryItemRoleFilterForm(OrganizationalModelFilterSetForm):
    model = InventoryItemRole
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
    )
    tag = TagFilterField(model)

@@ -1980,10 +1937,9 @@ class InventoryItemRoleFilterForm(OrganizationalModelFilterSetForm):
 class MACAddressFilterForm(PrimaryModelFilterSetForm):
    model = MACAddress
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('mac_address', name=_('Attributes')),
        FieldSet('device_id', 'virtual_machine_id', 'assigned', 'primary', name=_('Assignments')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    selector_fields = ('filter_id', 'q', 'device_id', 'virtual_machine_id')
    mac_address = forms.CharField(
--- a/netbox/dcim/forms/object_create.py
+++ b/netbox/dcim/forms/object_create.py
@@ -3,7 +3,6 @@ from django.utils.translation import gettext_lazy as _

 from dcim.models import *
 from netbox.forms import NetBoxModelForm
-from netbox.forms.mixins import OwnerMixin
 from utilities.forms.fields import DynamicModelChoiceField, DynamicModelMultipleChoiceField, ExpandableNameField
 from utilities.forms.rendering import FieldSet, TabbedGroups
 from utilities.forms.widgets import APISelect
@@ -272,7 +271,7 @@ class InventoryItemCreateForm(ComponentCreateForm, model_forms.InventoryItemForm
 # Virtual chassis
 #

-class VirtualChassisCreateForm(OwnerMixin, NetBoxModelForm):
+class VirtualChassisCreateForm(NetBoxModelForm):
    region = DynamicModelChoiceField(
        label=_('Region'),
        queryset=Region.objects.all(),
--- a/netbox/extras/forms/filtersets.py
+++ b/netbox/extras/forms/filtersets.py
@@ -9,10 +9,11 @@ from netbox.events import get_event_type_choices
 from netbox.forms import NetBoxModelFilterSetForm, PrimaryModelFilterSetForm
 from netbox.forms.mixins import SavedFiltersMixin
 from tenancy.models import Tenant, TenantGroup
-from users.models import Group, OwnerGroup, Owner, User
+from users.models import Group, Owner, User
 from utilities.forms import BOOLEAN_WITH_BLANK_CHOICES, FilterForm, add_blank_choice
 from utilities.forms.fields import (
-    ContentTypeChoiceField, ContentTypeMultipleChoiceField, DynamicModelMultipleChoiceField, TagFilterField,
+    ContentTypeChoiceField, ContentTypeMultipleChoiceField, DynamicModelChoiceField, DynamicModelMultipleChoiceField,
+    TagFilterField,
 )
 from utilities.forms.rendering import FieldSet
 from utilities.forms.widgets import DateTimePicker
@@ -46,7 +47,6 @@ class CustomFieldFilterForm(SavedFiltersMixin, FilterForm):
        FieldSet('choice_set_id', 'related_object_type_id', name=_('Type Options')),
        FieldSet('ui_visible', 'ui_editable', 'is_cloneable', name=_('Behavior')),
        FieldSet('validation_minimum', 'validation_maximum', 'validation_regex', name=_('Validation')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    object_type_id = ContentTypeMultipleChoiceField(
        queryset=ObjectType.objects.with_feature('custom_fields'),
@@ -119,19 +119,9 @@ class CustomFieldFilterForm(SavedFiltersMixin, FilterForm):
        label=_('Validation regex'),
        required=False
    )
-    owner_group_id = DynamicModelMultipleChoiceField(
-        queryset=OwnerGroup.objects.all(),
-        required=False,
-        null_option='None',
-        label=_('Owner Group'),
-    )
-    owner_id = DynamicModelMultipleChoiceField(
+    owner_id = DynamicModelChoiceField(
        queryset=Owner.objects.all(),
        required=False,
-        null_option='None',
-        query_params={
-            'group_id': '$owner_group_id'
-        },
        label=_('Owner'),
    )

@@ -141,7 +131,6 @@ class CustomFieldChoiceSetFilterForm(SavedFiltersMixin, FilterForm):
    fieldsets = (
        FieldSet('q', 'filter_id'),
        FieldSet('base_choices', 'choice', name=_('Choices')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    base_choices = forms.MultipleChoiceField(
        choices=CustomFieldChoiceSetBaseChoices,
@@ -150,19 +139,9 @@ class CustomFieldChoiceSetFilterForm(SavedFiltersMixin, FilterForm):
    choice = forms.CharField(
        required=False
    )
-    owner_group_id = DynamicModelMultipleChoiceField(
-        queryset=OwnerGroup.objects.all(),
-        required=False,
-        null_option='None',
-        label=_('Owner Group'),
-    )
-    owner_id = DynamicModelMultipleChoiceField(
+    owner_id = DynamicModelChoiceField(
        queryset=Owner.objects.all(),
        required=False,
-        null_option='None',
-        query_params={
-            'group_id': '$owner_group_id'
-        },
        label=_('Owner'),
    )

@@ -172,7 +151,6 @@ class CustomLinkFilterForm(SavedFiltersMixin, FilterForm):
    fieldsets = (
        FieldSet('q', 'filter_id'),
        FieldSet('object_type_id', 'enabled', 'new_window', 'weight', name=_('Attributes')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    object_type_id = ContentTypeMultipleChoiceField(
        label=_('Object types'),
@@ -197,19 +175,9 @@ class CustomLinkFilterForm(SavedFiltersMixin, FilterForm):
        label=_('Weight'),
        required=False
    )
-    owner_group_id = DynamicModelMultipleChoiceField(
-        queryset=OwnerGroup.objects.all(),
-        required=False,
-        null_option='None',
-        label=_('Owner Group'),
-    )
-    owner_id = DynamicModelMultipleChoiceField(
+    owner_id = DynamicModelChoiceField(
        queryset=Owner.objects.all(),
        required=False,
-        null_option='None',
-        query_params={
-            'group_id': '$owner_group_id'
-        },
        label=_('Owner'),
    )

@@ -220,7 +188,6 @@ class ExportTemplateFilterForm(SavedFiltersMixin, FilterForm):
        FieldSet('q', 'filter_id', 'object_type_id'),
        FieldSet('data_source_id', 'data_file_id', name=_('Data')),
        FieldSet('mime_type', 'file_name', 'file_extension', 'as_attachment', name=_('Rendering')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    data_source_id = DynamicModelMultipleChoiceField(
        queryset=DataSource.objects.all(),
@@ -259,19 +226,9 @@ class ExportTemplateFilterForm(SavedFiltersMixin, FilterForm):
            choices=BOOLEAN_WITH_BLANK_CHOICES
        )
    )
-    owner_group_id = DynamicModelMultipleChoiceField(
-        queryset=OwnerGroup.objects.all(),
-        required=False,
-        null_option='None',
-        label=_('Owner Group'),
-    )
-    owner_id = DynamicModelMultipleChoiceField(
+    owner_id = DynamicModelChoiceField(
        queryset=Owner.objects.all(),
        required=False,
-        null_option='None',
-        query_params={
-            'group_id': '$owner_group_id'
-        },
        label=_('Owner'),
    )

@@ -298,7 +255,6 @@ class SavedFilterFilterForm(SavedFiltersMixin, FilterForm):
    fieldsets = (
        FieldSet('q', 'filter_id'),
        FieldSet('object_type_id', 'enabled', 'shared', 'weight', name=_('Attributes')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    object_type_id = ContentTypeMultipleChoiceField(
        label=_('Object types'),
@@ -323,19 +279,9 @@ class SavedFilterFilterForm(SavedFiltersMixin, FilterForm):
        label=_('Weight'),
        required=False
    )
-    owner_group_id = DynamicModelMultipleChoiceField(
-        queryset=OwnerGroup.objects.all(),
-        required=False,
-        null_option='None',
-        label=_('Owner Group'),
-    )
-    owner_id = DynamicModelMultipleChoiceField(
+    owner_id = DynamicModelChoiceField(
        queryset=Owner.objects.all(),
        required=False,
-        null_option='None',
-        query_params={
-            'group_id': '$owner_group_id'
-        },
        label=_('Owner'),
    )

@@ -374,9 +320,8 @@ class TableConfigFilterForm(SavedFiltersMixin, FilterForm):
 class WebhookFilterForm(NetBoxModelFilterSetForm):
    model = Webhook
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('payload_url', 'http_method', 'http_content_type', name=_('Attributes')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    http_content_type = forms.CharField(
        label=_('HTTP content type'),
@@ -391,19 +336,9 @@ class WebhookFilterForm(NetBoxModelFilterSetForm):
        required=False,
        label=_('HTTP method')
    )
-    owner_group_id = DynamicModelMultipleChoiceField(
-        queryset=OwnerGroup.objects.all(),
-        required=False,
-        null_option='None',
-        label=_('Owner Group'),
-    )
-    owner_id = DynamicModelMultipleChoiceField(
+    owner_id = DynamicModelChoiceField(
        queryset=Owner.objects.all(),
        required=False,
-        null_option='None',
-        query_params={
-            'group_id': '$owner_group_id'
-        },
        label=_('Owner'),
    )
    tag = TagFilterField(model)
@@ -412,9 +347,8 @@ class WebhookFilterForm(NetBoxModelFilterSetForm):
 class EventRuleFilterForm(NetBoxModelFilterSetForm):
    model = EventRule
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('object_type_id', 'event_type', 'action_type', 'enabled', name=_('Attributes')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    object_type_id = ContentTypeMultipleChoiceField(
        queryset=ObjectType.objects.with_feature('event_rules'),
@@ -438,19 +372,9 @@ class EventRuleFilterForm(NetBoxModelFilterSetForm):
            choices=BOOLEAN_WITH_BLANK_CHOICES
        )
    )
-    owner_group_id = DynamicModelMultipleChoiceField(
-        queryset=OwnerGroup.objects.all(),
-        required=False,
-        null_option='None',
-        label=_('Owner Group'),
-    )
-    owner_id = DynamicModelMultipleChoiceField(
+    owner_id = DynamicModelChoiceField(
        queryset=Owner.objects.all(),
        required=False,
-        null_option='None',
-        query_params={
-            'group_id': '$owner_group_id'
-        },
        label=_('Owner'),
    )
    tag = TagFilterField(model)
@@ -458,11 +382,6 @@ class EventRuleFilterForm(NetBoxModelFilterSetForm):

 class TagFilterForm(SavedFiltersMixin, FilterForm):
    model = Tag
-    fieldsets = (
-        FieldSet('q', 'filter_id'),
-        FieldSet('content_type_id', 'for_object_type_id', name=_('Attributes')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
-    )
    content_type_id = ContentTypeMultipleChoiceField(
        queryset=ObjectType.objects.with_feature('tags'),
        required=False,
@@ -473,19 +392,9 @@ class TagFilterForm(SavedFiltersMixin, FilterForm):
        required=False,
        label=_('Allowed object type')
    )
-    owner_group_id = DynamicModelMultipleChoiceField(
-        queryset=OwnerGroup.objects.all(),
-        required=False,
-        null_option='None',
-        label=_('Owner Group'),
-    )
-    owner_id = DynamicModelMultipleChoiceField(
+    owner_id = DynamicModelChoiceField(
        queryset=Owner.objects.all(),
        required=False,
-        null_option='None',
-        query_params={
-            'group_id': '$owner_group_id'
-        },
        label=_('Owner'),
    )

@@ -495,7 +404,6 @@ class ConfigContextProfileFilterForm(PrimaryModelFilterSetForm):
    fieldsets = (
        FieldSet('q', 'filter_id'),
        FieldSet('data_source_id', 'data_file_id', name=_('Data')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    data_source_id = DynamicModelMultipleChoiceField(
        queryset=DataSource.objects.all(),
@@ -510,34 +418,18 @@ class ConfigContextProfileFilterForm(PrimaryModelFilterSetForm):
            'source_id': '$data_source_id'
        }
    )
-    owner_group_id = DynamicModelMultipleChoiceField(
-        queryset=OwnerGroup.objects.all(),
-        required=False,
-        null_option='None',
-        label=_('Owner Group'),
-    )
-    owner_id = DynamicModelMultipleChoiceField(
-        queryset=Owner.objects.all(),
-        required=False,
-        null_option='None',
-        query_params={
-            'group_id': '$owner_group_id'
-        },
-        label=_('Owner'),
-    )


 class ConfigContextFilterForm(SavedFiltersMixin, FilterForm):
    model = ConfigContext
    fieldsets = (
        FieldSet('q', 'filter_id', 'tag_id'),
-        FieldSet('profile_id', name=_('Config Context')),
+        FieldSet('profile', name=_('Config Context')),
        FieldSet('data_source_id', 'data_file_id', name=_('Data')),
        FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', name=_('Location')),
        FieldSet('device_type_id', 'platform_id', 'device_role_id', name=_('Device')),
        FieldSet('cluster_type_id', 'cluster_group_id', 'cluster_id', name=_('Cluster')),
-        FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
+        FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant'))
    )
    profile_id = DynamicModelMultipleChoiceField(
        queryset=ConfigContextProfile.objects.all(),
@@ -622,19 +514,9 @@ class ConfigContextFilterForm(SavedFiltersMixin, FilterForm):
        required=False,
        label=_('Tags')
    )
-    owner_group_id = DynamicModelMultipleChoiceField(
-        queryset=OwnerGroup.objects.all(),
-        required=False,
-        null_option='None',
-        label=_('Owner Group'),
-    )
-    owner_id = DynamicModelMultipleChoiceField(
+    owner_id = DynamicModelChoiceField(
        queryset=Owner.objects.all(),
        required=False,
-        null_option='None',
-        query_params={
-            'group_id': '$owner_group_id'
-        },
        label=_('Owner'),
    )

@@ -644,8 +526,7 @@ class ConfigTemplateFilterForm(SavedFiltersMixin, FilterForm):
    fieldsets = (
        FieldSet('q', 'filter_id', 'tag'),
        FieldSet('data_source_id', 'data_file_id', 'auto_sync_enabled', name=_('Data')),
-        FieldSet('mime_type', 'file_name', 'file_extension', 'as_attachment', name=_('Rendering')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
+        FieldSet('mime_type', 'file_name', 'file_extension', 'as_attachment', name=_('Rendering'))
    )
    data_source_id = DynamicModelMultipleChoiceField(
        queryset=DataSource.objects.all(),
@@ -687,19 +568,9 @@ class ConfigTemplateFilterForm(SavedFiltersMixin, FilterForm):
            choices=BOOLEAN_WITH_BLANK_CHOICES
        )
    )
-    owner_group_id = DynamicModelMultipleChoiceField(
-        queryset=OwnerGroup.objects.all(),
-        required=False,
-        null_option='None',
-        label=_('Owner Group'),
-    )
-    owner_id = DynamicModelMultipleChoiceField(
+    owner_id = DynamicModelChoiceField(
        queryset=Owner.objects.all(),
        required=False,
-        null_option='None',
-        query_params={
-            'group_id': '$owner_group_id'
-        },
        label=_('Owner'),
    )

--- a/netbox/extras/forms/model_forms.py
+++ b/netbox/extras/forms/model_forms.py
@@ -178,13 +178,6 @@ class CustomFieldChoiceSetForm(ChangelogMessageMixin, OwnerMixin, forms.ModelFor
        ) + ' <code>choice1:First Choice</code>')
    )

-    fieldsets = (
-        FieldSet(
-            'name', 'description', 'base_choices', 'extra_choices', 'order_alphabetically',
-            name=_('Custom Field Choice Set')
-        ),
-    )
-
    class Meta:
        model = CustomFieldChoiceSet
        fields = ('name', 'description', 'base_choices', 'extra_choices', 'order_alphabetically', 'owner')
--- a/netbox/extras/tests/test_models.py
+++ b/netbox/extras/tests/test_models.py
@@ -6,7 +6,7 @@ from django.core.files.uploadedfile import SimpleUploadedFile
 from django.forms import ValidationError
 from django.test import tag, TestCase

-from core.models import DataSource, ObjectType
+from core.models import AutoSyncRecord, DataSource, ObjectType
 from dcim.models import Device, DeviceRole, DeviceType, Location, Manufacturer, Platform, Region, Site, SiteGroup
 from extras.models import ConfigContext, ConfigContextProfile, ConfigTemplate, ImageAttachment, Tag, TaggedItem
 from tenancy.models import Tenant, TenantGroup
@@ -754,3 +754,53 @@ class ConfigTemplateTest(TestCase):
    @tag('regression')
    def test_config_template_with_data_source_nested_templates(self):
        self.assertEqual(self.BASE_TEMPLATE, self.main_config_template.render({}))
+
+    @tag('regression')
+    def test_autosyncrecord_cleanup_on_detach(self):
+        """Test that AutoSyncRecord is deleted when detaching from DataSource."""
+        with tempfile.TemporaryDirectory() as temp_dir:
+            templates_dir = Path(temp_dir) / "templates"
+            templates_dir.mkdir(parents=True, exist_ok=True)
+
+            self._create_template_file(templates_dir, 'test.j2', 'Test content')
+
+            data_source = DataSource(
+                name="Test DataSource for Detach",
+                type="local",
+                source_url=str(templates_dir),
+            )
+            data_source.save()
+            data_source.sync()
+
+            data_file = data_source.datafiles.filter(path__endswith='test.j2').first()
+
+            # Create a ConfigTemplate with data_file and auto_sync_enabled
+            config_template = ConfigTemplate(
+                name="TestTemplateForDetach",
+                data_file=data_file,
+                auto_sync_enabled=True
+            )
+            config_template.clean()
+            config_template.save()
+
+            # Verify AutoSyncRecord was created
+            object_type = ObjectType.objects.get_for_model(ConfigTemplate)
+            autosync_records = AutoSyncRecord.objects.filter(
+                object_type=object_type,
+                object_id=config_template.pk
+            )
+            self.assertEqual(autosync_records.count(), 1, "AutoSyncRecord should be created")
+
+            # Detach from DataSource
+            config_template.data_file = None
+            config_template.data_source = None
+            config_template.auto_sync_enabled = False
+            config_template.clean()
+            config_template.save()
+
+            # Verify AutoSyncRecord was deleted
+            autosync_records = AutoSyncRecord.objects.filter(
+                object_type=object_type,
+                object_id=config_template.pk
+            )
+            self.assertEqual(autosync_records.count(), 0, "AutoSyncRecord should be deleted after detaching")
--- a/netbox/ipam/forms/filtersets.py
+++ b/netbox/ipam/forms/filtersets.py
@@ -45,10 +45,9 @@ IPADDRESS_MASK_LENGTH_CHOICES = add_blank_choice([
 class VRFFilterForm(TenancyFilterForm, PrimaryModelFilterSetForm):
    model = VRF
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('import_target_id', 'export_target_id', name=_('Route Targets')),
        FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    import_target_id = DynamicModelMultipleChoiceField(
        queryset=RouteTarget.objects.all(),
@@ -66,10 +65,9 @@ class VRFFilterForm(TenancyFilterForm, PrimaryModelFilterSetForm):
 class RouteTargetFilterForm(TenancyFilterForm, PrimaryModelFilterSetForm):
    model = RouteTarget
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('importing_vrf_id', 'exporting_vrf_id', name=_('VRF')),
        FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    importing_vrf_id = DynamicModelMultipleChoiceField(
        queryset=VRF.objects.all(),
@@ -87,9 +85,8 @@ class RouteTargetFilterForm(TenancyFilterForm, PrimaryModelFilterSetForm):
 class RIRFilterForm(OrganizationalModelFilterSetForm):
    model = RIR
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('is_private', name=_('RIR')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    is_private = forms.NullBooleanField(
        required=False,
@@ -104,10 +101,9 @@ class RIRFilterForm(OrganizationalModelFilterSetForm):
 class AggregateFilterForm(ContactModelFilterForm, TenancyFilterForm, PrimaryModelFilterSetForm):
    model = Aggregate
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('family', 'rir_id', name=_('Attributes')),
        FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
        FieldSet('contact', 'contact_role', 'contact_group', name=_('Contacts')),
    )
    family = forms.ChoiceField(
@@ -126,10 +122,9 @@ class AggregateFilterForm(ContactModelFilterForm, TenancyFilterForm, PrimaryMode
 class ASNRangeFilterForm(TenancyFilterForm, OrganizationalModelFilterSetForm):
    model = ASNRange
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('rir_id', 'start', 'end', name=_('Range')),
        FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    rir_id = DynamicModelMultipleChoiceField(
        queryset=RIR.objects.all(),
@@ -150,10 +145,9 @@ class ASNRangeFilterForm(TenancyFilterForm, OrganizationalModelFilterSetForm):
 class ASNFilterForm(TenancyFilterForm, PrimaryModelFilterSetForm):
    model = ASN
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('rir_id', 'site_group_id', 'site_id', name=_('Assignment')),
        FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    rir_id = DynamicModelMultipleChoiceField(
        queryset=RIR.objects.all(),
@@ -176,8 +170,7 @@ class ASNFilterForm(TenancyFilterForm, PrimaryModelFilterSetForm):
 class RoleFilterForm(OrganizationalModelFilterSetForm):
    model = Role
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
    )
    tag = TagFilterField(model)

@@ -185,7 +178,7 @@ class RoleFilterForm(OrganizationalModelFilterSetForm):
 class PrefixFilterForm(ContactModelFilterForm, TenancyFilterForm, PrimaryModelFilterSetForm):
    model = Prefix
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet(
            'within_include', 'family', 'status', 'role_id', 'mask_length', 'is_pool', 'mark_utilized',
            name=_('Addressing')
@@ -194,7 +187,6 @@ class PrefixFilterForm(ContactModelFilterForm, TenancyFilterForm, PrimaryModelFi
        FieldSet('vrf_id', 'present_in_vrf_id', name=_('VRF')),
        FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', name=_('Scope')),
        FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
        FieldSet('contact', 'contact_role', 'contact_group', name=_('Contacts')),
    )
    mask_length__lte = forms.IntegerField(
@@ -292,10 +284,9 @@ class PrefixFilterForm(ContactModelFilterForm, TenancyFilterForm, PrimaryModelFi
 class IPRangeFilterForm(ContactModelFilterForm, TenancyFilterForm, PrimaryModelFilterSetForm):
    model = IPRange
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('family', 'vrf_id', 'status', 'role_id', 'mark_populated', 'mark_utilized', name=_('Attributes')),
        FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
        FieldSet('contact', 'contact_role', 'contact_group', name=_('Contacts')),
    )
    family = forms.ChoiceField(
@@ -340,15 +331,14 @@ class IPRangeFilterForm(ContactModelFilterForm, TenancyFilterForm, PrimaryModelF
 class IPAddressFilterForm(ContactModelFilterForm, TenancyFilterForm, PrimaryModelFilterSetForm):
    model = IPAddress
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet(
            'parent', 'family', 'status', 'role', 'mask_length', 'assigned_to_interface', 'dns_name',
            name=_('Attributes')
        ),
        FieldSet('vrf_id', 'present_in_vrf_id', name=_('VRF')),
-        FieldSet('device_id', 'virtual_machine_id', name=_('Device/VM')),
        FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
+        FieldSet('device_id', 'virtual_machine_id', name=_('Device/VM')),
        FieldSet('contact', 'contact_role', 'contact_group', name=_('Contacts')),
    )
    selector_fields = ('filter_id', 'q', 'region_id', 'group_id', 'parent', 'status', 'role')
@@ -419,10 +409,9 @@ class IPAddressFilterForm(ContactModelFilterForm, TenancyFilterForm, PrimaryMode
 class FHRPGroupFilterForm(PrimaryModelFilterSetForm):
    model = FHRPGroup
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('name', 'protocol', 'group_id', name=_('Attributes')),
        FieldSet('auth_type', 'auth_key', name=_('Authentication')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    name = forms.CharField(
        label=_('Name'),
@@ -452,12 +441,11 @@ class FHRPGroupFilterForm(PrimaryModelFilterSetForm):

 class VLANGroupFilterForm(TenancyFilterForm, OrganizationalModelFilterSetForm):
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('region', 'site_group', 'site', 'location', 'rack', name=_('Location')),
        FieldSet('cluster_group', 'cluster', name=_('Cluster')),
        FieldSet('contains_vid', name=_('VLANs')),
        FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    model = VLANGroup
    region = DynamicModelMultipleChoiceField(
@@ -507,9 +495,8 @@ class VLANGroupFilterForm(TenancyFilterForm, OrganizationalModelFilterSetForm):
 class VLANTranslationPolicyFilterForm(PrimaryModelFilterSetForm):
    model = VLANTranslationPolicy
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('name', name=_('Attributes')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    name = forms.CharField(
        required=False,
@@ -545,12 +532,11 @@ class VLANTranslationRuleFilterForm(NetBoxModelFilterSetForm):
 class VLANFilterForm(TenancyFilterForm, PrimaryModelFilterSetForm):
    model = VLAN
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('region_id', 'site_group_id', 'site_id', name=_('Location')),
        FieldSet('group_id', 'status', 'role_id', 'vid', 'l2vpn_id', name=_('Attributes')),
        FieldSet('qinq_role', 'qinq_svlan_id', name=_('Q-in-Q/802.1ad')),
        FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    selector_fields = ('filter_id', 'q', 'group_id')
    region_id = DynamicModelMultipleChoiceField(
@@ -618,9 +604,8 @@ class VLANFilterForm(TenancyFilterForm, PrimaryModelFilterSetForm):
 class ServiceTemplateFilterForm(PrimaryModelFilterSetForm):
    model = ServiceTemplate
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('protocol', 'port', name=_('Attributes')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    protocol = forms.ChoiceField(
        label=_('Protocol'),
@@ -637,10 +622,9 @@ class ServiceTemplateFilterForm(PrimaryModelFilterSetForm):
 class ServiceFilterForm(ContactModelFilterForm, ServiceTemplateFilterForm):
    model = Service
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('protocol', 'port', name=_('Attributes')),
        FieldSet('device_id', 'virtual_machine_id', 'fhrpgroup_id', name=_('Assignment')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
        FieldSet('contact', 'contact_role', 'contact_group', name=_('Contacts')),
    )
    device_id = DynamicModelMultipleChoiceField(
--- a/netbox/ipam/tables/ip.py
+++ b/netbox/ipam/tables/ip.py
@@ -370,6 +370,11 @@ class AnnotatedIPAddressTable(IPAddressTable):
        verbose_name=_('IP Address')
    )

+    def render_pk(self, value, record, bound_column):
+        if type(record) is not self._meta.model:
+            return ''
+        return bound_column.column.render(value, bound_column, record)
+
    class Meta(IPAddressTable.Meta):
        pass

--- a/netbox/ipam/tests/test_tables.py
+++ b/netbox/ipam/tests/test_tables.py
@@ -0,0 +1,41 @@
+from django.test import RequestFactory, TestCase
+from netaddr import IPNetwork
+
+from ipam.models import IPAddress, IPRange, Prefix
+from ipam.tables import AnnotatedIPAddressTable
+from ipam.utils import annotate_ip_space
+
+
+class AnnotatedIPAddressTableTest(TestCase):
+
+    @classmethod
+    def setUpTestData(cls):
+        cls.prefix = Prefix.objects.create(
+            prefix=IPNetwork('10.1.1.0/24'),
+            status='active'
+        )
+
+        cls.ip_address = IPAddress.objects.create(
+            address='10.1.1.1/24',
+            status='active'
+        )
+
+        cls.ip_range = IPRange.objects.create(
+            start_address=IPNetwork('10.1.1.2/24'),
+            end_address=IPNetwork('10.1.1.10/24'),
+            status='active'
+        )
+
+    def test_ipaddress_has_checkbox_iprange_does_not(self):
+        data = annotate_ip_space(self.prefix)
+        table = AnnotatedIPAddressTable(data, orderable=False)
+        table.columns.show('pk')
+
+        request = RequestFactory().get('/')
+        html = table.as_html(request)
+
+        ipaddress_checkbox_count = html.count(f'name="pk" value="{self.ip_address.pk}"')
+        self.assertEqual(ipaddress_checkbox_count, 1)
+
+        iprange_checkbox_count = html.count(f'name="pk" value="{self.ip_range.pk}"')
+        self.assertEqual(iprange_checkbox_count, 0)
--- a/netbox/ipam/utils.py
+++ b/netbox/ipam/utils.py
@@ -49,6 +49,9 @@ def add_requested_prefixes(parent, prefix_list, show_available=True, show_assign
    if prefix_list and show_available:

        # Find all unallocated space, add fake Prefix objects to child_prefixes.
+        # IMPORTANT: These are unsaved Prefix instances (pk=None). If this is ever changed to use
+        # saved Prefix instances with real pks, bulk delete will fail for mixed-type selections
+        # due to single-model form validation. See: https://github.com/netbox-community/netbox/issues/21176
        available_prefixes = netaddr.IPSet(parent) ^ netaddr.IPSet([p.prefix for p in prefix_list])
        available_prefixes = [Prefix(prefix=p, status=None) for p in available_prefixes.iter_cidrs()]
        child_prefixes = child_prefixes + available_prefixes
--- a/netbox/netbox/forms/filtersets.py
+++ b/netbox/netbox/forms/filtersets.py
@@ -3,8 +3,8 @@ from django.db.models import Q
 from django.utils.translation import gettext_lazy as _

 from extras.choices import *
-from users.models import OwnerGroup, Owner
-from utilities.forms.fields import DynamicModelMultipleChoiceField, QueryField
+from users.models import Owner
+from utilities.forms.fields import DynamicModelChoiceField, QueryField
 from utilities.forms.mixins import FilterModifierMixin
 from .mixins import CustomFieldsMixin, SavedFiltersMixin

@@ -48,19 +48,9 @@ class NetBoxModelFilterSetForm(FilterModifierMixin, CustomFieldsMixin, SavedFilt


 class OwnerFilterMixin(forms.Form):
-    owner_group_id = DynamicModelMultipleChoiceField(
-        queryset=OwnerGroup.objects.all(),
-        required=False,
-        null_option='None',
-        label=_('Owner Group'),
-    )
-    owner_id = DynamicModelMultipleChoiceField(
+    owner_id = DynamicModelChoiceField(
        queryset=Owner.objects.all(),
        required=False,
-        null_option='None',
-        query_params={
-            'group_id': '$owner_group_id'
-        },
        label=_('Owner'),
    )

--- a/netbox/netbox/forms/mixins.py
+++ b/netbox/netbox/forms/mixins.py
@@ -4,7 +4,7 @@ from django.utils.translation import gettext as _
 from core.models import ObjectType
 from extras.choices import *
 from extras.models import *
-from users.models import OwnerGroup, Owner
+from users.models import Owner
 from utilities.forms.fields import DynamicModelChoiceField, DynamicModelMultipleChoiceField

 __all__ = (
@@ -126,17 +126,8 @@ class OwnerMixin(forms.Form):
    """
    Add an `owner` field to forms for models which support Owner assignment.
    """
-
-    owner_group = DynamicModelChoiceField(
-        label=_('Owner group'),
-        queryset=OwnerGroup.objects.all(),
-        required=False,
-        null_option='None',
-        initial_params={'members': '$owner'},
-    )
    owner = DynamicModelChoiceField(
        queryset=Owner.objects.all(),
        required=False,
-        query_params={'group_id': '$owner_group'},
        label=_('Owner'),
    )
--- a/netbox/netbox/models/features.py
+++ b/netbox/netbox/models/features.py
@@ -569,7 +569,6 @@ class SyncedDataMixin(models.Model):
            )
        else:
            AutoSyncRecord.objects.filter(
-                datafile=self.data_file,
                object_type=object_type,
                object_id=self.pk
            ).delete()
@@ -582,7 +581,6 @@ class SyncedDataMixin(models.Model):
        # Delete AutoSyncRecord
        object_type = ObjectType.objects.get_for_model(self)
        AutoSyncRecord.objects.filter(
-            datafile=self.data_file,
            object_type=object_type,
            object_id=self.pk
        ).delete()
--- a/netbox/netbox/tables/tables.py
+++ b/netbox/netbox/tables/tables.py
@@ -271,14 +271,9 @@ class NetBoxTable(BaseTable):


 class PrimaryModelTable(NetBoxTable):
-    owner_group = tables.Column(
-        accessor='owner__group',
-        linkify=True,
-        verbose_name=_('Owner Group'),
-    )
    owner = tables.Column(
        linkify=True,
-        verbose_name=_('Owner'),
+        verbose_name=_('Owner')
    )
    comments = columns.MarkdownColumn(
        verbose_name=_('Comments'),
@@ -286,14 +281,9 @@ class PrimaryModelTable(NetBoxTable):


 class OrganizationalModelTable(NetBoxTable):
-    owner_group = tables.Column(
-        accessor='owner__group',
-        linkify=True,
-        verbose_name=_('Owner Group'),
-    )
    owner = tables.Column(
        linkify=True,
-        verbose_name=_('Owner'),
+        verbose_name=_('Owner')
    )
    comments = columns.MarkdownColumn(
        verbose_name=_('Comments'),
@@ -301,14 +291,9 @@ class OrganizationalModelTable(NetBoxTable):


 class NestedGroupModelTable(NetBoxTable):
-    owner_group = tables.Column(
-        accessor='owner__group',
-        linkify=True,
-        verbose_name=_('Owner Group'),
-    )
    owner = tables.Column(
        linkify=True,
-        verbose_name=_('Owner'),
+        verbose_name=_('Owner')
    )
    name = columns.MPTTColumn(
        verbose_name=_('Name'),
--- a/netbox/templates/dcim/device_edit.html
+++ b/netbox/templates/dcim/device_edit.html
@@ -101,9 +101,8 @@

    <div class="field-group mb-5">
      <div class="row">
-        <h2 class="col-9 offset-3">{% trans "Ownership" %}</h2>
+        <h2 class="col-9 offset-3">{% trans "Owner" %}</h2>
      </div>
-      {% render_field form.owner_group %}
      {% render_field form.owner %}
    </div>

--- a/netbox/templates/dcim/htmx/cable_edit.html
+++ b/netbox/templates/dcim/htmx/cable_edit.html
@@ -80,9 +80,8 @@

 <div class="field-group mb-5">
  <div class="row">
-    <h2 class="col-9 offset-3">{% trans "Ownership" %}</h2>
+    <h2 class="col-9 offset-3">{% trans "Owner" %}</h2>
  </div>
-  {% render_field form.owner_group %}
  {% render_field form.owner %}
 </div>

--- a/netbox/templates/dcim/virtualchassis_edit.html
+++ b/netbox/templates/dcim/virtualchassis_edit.html
@@ -38,7 +38,6 @@
        <div class="row">
          <h2 class="col-9 offset-3">{% trans "Owner" %}</h2>
        </div>
-        {% render_field vc_form.owner_group %}
        {% render_field vc_form.owner %}
      </div>

--- a/netbox/templates/htmx/form.html
+++ b/netbox/templates/htmx/form.html
@@ -27,9 +27,6 @@
      <div class="row">
        <h2 class="col-9 offset-3">{% trans "Ownership" %}</h2>
      </div>
-      {% if form.owner_group %}
-        {% render_field form.owner_group %}
-      {% endif %}
      {% render_field form.owner %}
    </div>
  {% endif %}
--- a/netbox/templates/ipam/vlan_edit.html
+++ b/netbox/templates/ipam/vlan_edit.html
@@ -67,9 +67,8 @@

  <div class="field-group mb-5">
    <div class="row">
-      <h2 class="col-9 offset-3">{% trans "Ownership" %}</h2>
+      <h2 class="col-9 offset-3">{% trans "Owner" %}</h2>
    </div>
-    {% render_field form.owner_group %}
    {% render_field form.owner %}
  </div>

--- a/netbox/tenancy/forms/filtersets.py
+++ b/netbox/tenancy/forms/filtersets.py
@@ -31,9 +31,8 @@ __all__ = (
 class TenantGroupFilterForm(NestedGroupModelFilterSetForm):
    model = TenantGroup
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('parent_id', name=_('Tenant Group')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    parent_id = DynamicModelMultipleChoiceField(
        queryset=TenantGroup.objects.all(),
@@ -46,9 +45,8 @@ class TenantGroupFilterForm(NestedGroupModelFilterSetForm):
 class TenantFilterForm(ContactModelFilterForm, PrimaryModelFilterSetForm):
    model = Tenant
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('group_id', name=_('Tenant')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
        FieldSet('contact', 'contact_role', 'contact_group', name=_('Contacts'))
    )
    group_id = DynamicModelMultipleChoiceField(
@@ -67,9 +65,8 @@ class TenantFilterForm(ContactModelFilterForm, PrimaryModelFilterSetForm):
 class ContactGroupFilterForm(NestedGroupModelFilterSetForm):
    model = ContactGroup
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('parent_id', name=_('Contact Group')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    parent_id = DynamicModelMultipleChoiceField(
        queryset=ContactGroup.objects.all(),
@@ -82,8 +79,7 @@ class ContactGroupFilterForm(NestedGroupModelFilterSetForm):
 class ContactRoleFilterForm(OrganizationalModelFilterSetForm):
    model = ContactRole
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
    )
    tag = TagFilterField(model)

@@ -91,9 +87,8 @@ class ContactRoleFilterForm(OrganizationalModelFilterSetForm):
 class ContactFilterForm(PrimaryModelFilterSetForm):
    model = Contact
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('group_id', name=_('Contact')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    group_id = DynamicModelMultipleChoiceField(
        queryset=ContactGroup.objects.all(),
--- a/netbox/users/filterset_mixins.py
+++ b/netbox/users/filterset_mixins.py
@@ -1,7 +1,7 @@
 import django_filters
 from django.utils.translation import gettext as _

-from users.models import OwnerGroup, Owner
+from users.models import Owner

 __all__ = (
    'OwnerFilterMixin',
@@ -12,17 +12,6 @@ class OwnerFilterMixin(django_filters.FilterSet):
    """
    Adds owner & owner_id filters for models which inherit from OwnerMixin.
    """
-    owner_group_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=OwnerGroup.objects.all(),
-        field_name='owner__group',
-        label=_('Owner Group (ID)'),
-    )
-    owner_group = django_filters.ModelMultipleChoiceFilter(
-        queryset=OwnerGroup.objects.all(),
-        field_name='owner__group',
-        to_field_name='name',
-        label=_('Owner Group (name)'),
-    )
    owner_id = django_filters.ModelMultipleChoiceFilter(
        queryset=Owner.objects.all(),
        label=_('Owner (ID)'),
--- a/netbox/virtualization/forms/filtersets.py
+++ b/netbox/virtualization/forms/filtersets.py
@@ -8,9 +8,9 @@ from extras.models import ConfigTemplate
 from ipam.models import VRF, VLANTranslationPolicy
 from netbox.forms import NetBoxModelFilterSetForm, OrganizationalModelFilterSetForm, PrimaryModelFilterSetForm
 from tenancy.forms import ContactModelFilterForm, TenancyFilterForm
-from users.models import OwnerGroup, Owner
+from users.models import Owner
 from utilities.forms import BOOLEAN_WITH_BLANK_CHOICES
-from utilities.forms.fields import DynamicModelMultipleChoiceField, TagFilterField
+from utilities.forms.fields import DynamicModelChoiceField, DynamicModelMultipleChoiceField, TagFilterField
 from utilities.forms.rendering import FieldSet
 from virtualization.choices import *
 from virtualization.models import *
@@ -29,8 +29,7 @@ __all__ = (
 class ClusterTypeFilterForm(OrganizationalModelFilterSetForm):
    model = ClusterType
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
    )
    tag = TagFilterField(model)

@@ -39,8 +38,7 @@ class ClusterGroupFilterForm(ContactModelFilterForm, OrganizationalModelFilterSe
    model = ClusterGroup
    tag = TagFilterField(model)
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('contact', 'contact_role', 'contact_group', name=_('Contacts')),
    )

@@ -48,11 +46,10 @@ class ClusterGroupFilterForm(ContactModelFilterForm, OrganizationalModelFilterSe
 class ClusterFilterForm(TenancyFilterForm, ContactModelFilterForm, PrimaryModelFilterSetForm):
    model = Cluster
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('group_id', 'type_id', 'status', name=_('Attributes')),
        FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', name=_('Scope')),
        FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
        FieldSet('contact', 'contact_role', 'contact_group', name=_('Contacts')),
    )
    selector_fields = ('filter_id', 'q', 'group_id')
@@ -108,7 +105,7 @@ class VirtualMachineFilterForm(
 ):
    model = VirtualMachine
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('cluster_group_id', 'cluster_type_id', 'cluster_id', 'device_id', name=_('Cluster')),
        FieldSet('region_id', 'site_group_id', 'site_id', name=_('Location')),
        FieldSet(
@@ -116,7 +113,6 @@ class VirtualMachineFilterForm(
            'local_context_data', 'serial', name=_('Attributes')
        ),
        FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
        FieldSet('contact', 'contact_role', 'contact_group', name=_('Contacts')),
    )
    cluster_group_id = DynamicModelMultipleChoiceField(
@@ -212,12 +208,11 @@ class VirtualMachineFilterForm(
 class VMInterfaceFilterForm(NetBoxModelFilterSetForm):
    model = VMInterface
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('cluster_id', 'virtual_machine_id', name=_('Virtual Machine')),
        FieldSet('enabled', name=_('Attributes')),
        FieldSet('vrf_id', 'l2vpn_id', 'mac_address', name=_('Addressing')),
        FieldSet('mode', 'vlan_translation_policy_id', name=_('802.1Q Switching')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    selector_fields = ('filter_id', 'q', 'virtual_machine_id')
    cluster_id = DynamicModelMultipleChoiceField(
@@ -264,19 +259,9 @@ class VMInterfaceFilterForm(NetBoxModelFilterSetForm):
        required=False,
        label=_('VLAN Translation Policy')
    )
-    owner_group_id = DynamicModelMultipleChoiceField(
-        queryset=OwnerGroup.objects.all(),
-        required=False,
-        null_option='None',
-        label=_('Owner Group'),
-    )
-    owner_id = DynamicModelMultipleChoiceField(
+    owner_id = DynamicModelChoiceField(
        queryset=Owner.objects.all(),
        required=False,
-        null_option='None',
-        query_params={
-            'group_id': '$owner_group_id'
-        },
        label=_('Owner'),
    )
    tag = TagFilterField(model)
@@ -285,10 +270,9 @@ class VMInterfaceFilterForm(NetBoxModelFilterSetForm):
 class VirtualDiskFilterForm(NetBoxModelFilterSetForm):
    model = VirtualDisk
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('virtual_machine_id', name=_('Virtual Machine')),
        FieldSet('size', name=_('Attributes')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    virtual_machine_id = DynamicModelMultipleChoiceField(
        queryset=VirtualMachine.objects.all(),
@@ -300,19 +284,9 @@ class VirtualDiskFilterForm(NetBoxModelFilterSetForm):
        required=False,
        min_value=1
    )
-    owner_group_id = DynamicModelMultipleChoiceField(
-        queryset=OwnerGroup.objects.all(),
-        required=False,
-        null_option='None',
-        label=_('Owner Group'),
-    )
-    owner_id = DynamicModelMultipleChoiceField(
+    owner_id = DynamicModelChoiceField(
        queryset=Owner.objects.all(),
        required=False,
-        null_option='None',
-        query_params={
-            'group_id': '$owner_group_id'
-        },
        label=_('Owner'),
    )
    tag = TagFilterField(model)
--- a/netbox/vpn/forms/filtersets.py
+++ b/netbox/vpn/forms/filtersets.py
@@ -33,8 +33,7 @@ __all__ = (
 class TunnelGroupFilterForm(ContactModelFilterForm, OrganizationalModelFilterSetForm):
    model = TunnelGroup
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('contact', 'contact_role', 'contact_group', name=_('Contacts')),
    )
    tag = TagFilterField(model)
@@ -43,11 +42,10 @@ class TunnelGroupFilterForm(ContactModelFilterForm, OrganizationalModelFilterSet
 class TunnelFilterForm(ContactModelFilterForm, TenancyFilterForm, PrimaryModelFilterSetForm):
    model = Tunnel
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('status', 'encapsulation', 'tunnel_id', name=_('Tunnel')),
        FieldSet('ipsec_profile_id', name=_('Security')),
        FieldSet('tenant_group_id', 'tenant_id', name=_('Tenancy')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
        FieldSet('contact', 'contact_role', 'contact_group', name=_('Contacts')),
    )
    status = forms.MultipleChoiceField(
@@ -99,11 +97,10 @@ class TunnelTerminationFilterForm(NetBoxModelFilterSetForm):
 class IKEProposalFilterForm(PrimaryModelFilterSetForm):
    model = IKEProposal
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet(
            'authentication_method', 'encryption_algorithm', 'authentication_algorithm', 'group', name=_('Parameters')
        ),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    authentication_method = forms.MultipleChoiceField(
        label=_('Authentication method'),
@@ -131,9 +128,8 @@ class IKEProposalFilterForm(PrimaryModelFilterSetForm):
 class IKEPolicyFilterForm(PrimaryModelFilterSetForm):
    model = IKEPolicy
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('version', 'mode', 'proposal_id', name=_('Parameters')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    version = forms.MultipleChoiceField(
        label=_('IKE version'),
@@ -156,9 +152,8 @@ class IKEPolicyFilterForm(PrimaryModelFilterSetForm):
 class IPSecProposalFilterForm(PrimaryModelFilterSetForm):
    model = IPSecProposal
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('encryption_algorithm', 'authentication_algorithm', name=_('Parameters')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    encryption_algorithm = forms.MultipleChoiceField(
        label=_('Encryption algorithm'),
@@ -176,9 +171,8 @@ class IPSecProposalFilterForm(PrimaryModelFilterSetForm):
 class IPSecPolicyFilterForm(PrimaryModelFilterSetForm):
    model = IPSecPolicy
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('proposal_id', 'pfs_group', name=_('Parameters')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    proposal_id = DynamicModelMultipleChoiceField(
        queryset=IKEProposal.objects.all(),
@@ -196,9 +190,8 @@ class IPSecPolicyFilterForm(PrimaryModelFilterSetForm):
 class IPSecProfileFilterForm(PrimaryModelFilterSetForm):
    model = IPSecProfile
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('mode', 'ike_policy_id', 'ipsec_policy_id', name=_('Profile')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    mode = forms.MultipleChoiceField(
        label=_('Mode'),
@@ -221,10 +214,9 @@ class IPSecProfileFilterForm(PrimaryModelFilterSetForm):
 class L2VPNFilterForm(ContactModelFilterForm, TenancyFilterForm, PrimaryModelFilterSetForm):
    model = L2VPN
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('type', 'status', 'import_target_id', 'export_target_id', name=_('Attributes')),
        FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
        FieldSet('contact', 'contact_role', 'contact_group', name=_('Contacts')),
    )
    status = forms.MultipleChoiceField(
--- a/netbox/wireless/forms/filtersets.py
+++ b/netbox/wireless/forms/filtersets.py
@@ -22,9 +22,8 @@ __all__ = (
 class WirelessLANGroupFilterForm(NestedGroupModelFilterSetForm):
    model = WirelessLANGroup
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('parent_id', name=_('Wireless LAN group')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
    )
    parent_id = DynamicModelMultipleChoiceField(
        queryset=WirelessLANGroup.objects.all(),
@@ -37,12 +36,11 @@ class WirelessLANGroupFilterForm(NestedGroupModelFilterSetForm):
 class WirelessLANFilterForm(TenancyFilterForm, PrimaryModelFilterSetForm):
    model = WirelessLAN
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('ssid', 'group_id', 'status', name=_('Attributes')),
        FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', name=_('Scope')),
-        FieldSet('auth_type', 'auth_cipher', 'auth_psk', name=_('Authentication')),
        FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
+        FieldSet('auth_type', 'auth_cipher', 'auth_psk', name=_('Authentication')),
    )
    ssid = forms.CharField(
        required=False,
@@ -104,11 +102,10 @@ class WirelessLANFilterForm(TenancyFilterForm, PrimaryModelFilterSetForm):
 class WirelessLinkFilterForm(TenancyFilterForm, PrimaryModelFilterSetForm):
    model = WirelessLink
    fieldsets = (
-        FieldSet('q', 'filter_id', 'tag'),
+        FieldSet('q', 'filter_id', 'tag', 'owner_id'),
        FieldSet('ssid', 'status', 'distance', 'distance_unit', name=_('Attributes')),
-        FieldSet('auth_type', 'auth_cipher', 'auth_psk', name=_('Authentication')),
        FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
-        FieldSet('owner_group_id', 'owner_id', name=_('Ownership')),
+        FieldSet('auth_type', 'auth_cipher', 'auth_psk', name=_('Authentication')),
    )
    ssid = forms.CharField(
        required=False,
Author	SHA1	Message	Date
Jason Novinger	cedbeb7b19	Fixes #21176 : Remove checkboxes from IP ranges in mixed-type tables When IP addresses and IP ranges are displayed together in a prefix's IP Addresses tab, only IP addresses should be selectable for bulk operations since the bulk delete form doesn't support mixed object types. - Override render_pk() in AnnotatedIPAddressTable to conditionally render checkboxes only for the table's primary model type (IPAddress) - Add warning comment to add_requested_prefixes() about fake Prefix objects - Add regression test to verify IPAddress has checkboxes but IPRange does not	2026-01-23 09:36:15 -06:00
Aditya Sharma	e81ccb9be6	Fixes #21214 : Clean up AutoSyncRecord when detaching from DataSource (#21219 ) Some checks failed CodeQL / Analyze (actions) (push) Has been cancelled Details CodeQL / Analyze (javascript-typescript) (push) Has been cancelled Details CodeQL / Analyze (python) (push) Has been cancelled Details CI / build (20.x, 3.12) (push) Has been cancelled Details CI / build (20.x, 3.13) (push) Has been cancelled Details CI / build (20.x, 3.14) (push) Has been cancelled Details Lock threads / lock (push) Has been cancelled Details Close stale issues/PRs / stale (push) Has been cancelled Details Close incomplete issues / stale (push) Has been cancelled Details Update translation strings / makemessages (push) Has been cancelled Details Co-authored-by: adionit7 <adionit7@users.noreply.github.com>	2026-01-21 16:38:27 -06:00
Jeremy Stretch	bc83d04c8f	Introduce performance issue template (#21247 )	2026-01-21 16:34:01 -06:00