Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Switch from deprecated FilterSet to new FilterSetMixin #503

Merged
merged 1 commit into from May 31, 2023
Merged

Switch from deprecated FilterSet to new FilterSetMixin #503

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions nautobot_golden_config/filters.py
View file
Open in desktop
Expand Up @@ -3,14 +3,14 @@
import django_filters
from django.db.models import Q
from nautobot.dcim.models import Device, DeviceRole, DeviceType, Manufacturer, Platform, Rack, RackGroup, Region, Site
from nautobot.extras.filters import CustomFieldModelFilterSet, StatusFilter
from nautobot.extras.filters import CustomFieldModelFilterSetMixin, StatusFilter
from nautobot.extras.models import Status
from nautobot.tenancy.models import Tenant, TenantGroup
from nautobot.utilities.filters import BaseFilterSet, NameSlugSearchFilterSet, TreeNodeMultipleChoiceFilter
from nautobot_golden_config import models


class GenericPlatformFilterSet(CustomFieldModelFilterSet):
class GenericPlatformFilterSet(CustomFieldModelFilterSetMixin):
"""Generic method to reuse common FilterSet."""

platform_id = django_filters.ModelMultipleChoiceFilter(
Expand All @@ -25,7 +25,7 @@ class GenericPlatformFilterSet(CustomFieldModelFilterSet):
)


class GoldenConfigFilterSet(CustomFieldModelFilterSet):
class GoldenConfigFilterSet(CustomFieldModelFilterSetMixin):
"""Filter capabilities for GoldenConfig instances."""

q = django_filters.CharFilter(
Expand Down Expand Up @@ -188,8 +188,8 @@ class Meta:
fields = ["id"]


class ComplianceFeatureFilterSet(CustomFieldModelFilterSet):
"""Inherits Base Class CustomFieldModelFilterSet."""
class ComplianceFeatureFilterSet(CustomFieldModelFilterSetMixin):
"""Inherits Base Class CustomFieldModelFilterSetMixin."""

q = django_filters.CharFilter(
method="search",
Expand All @@ -211,7 +211,7 @@ class Meta:


class ComplianceRuleFilterSet(GenericPlatformFilterSet):
"""Inherits Base Class CustomFieldModelFilterSet."""
"""Inherits Base Class CustomFieldModelFilterSetMixin."""

q = django_filters.CharFilter(
method="search",
Expand All @@ -233,7 +233,7 @@ class Meta:


class ConfigRemoveFilterSet(GenericPlatformFilterSet):
"""Inherits Base Class CustomFieldModelFilterSet."""
"""Inherits Base Class CustomFieldModelFilterSetMixin."""

q = django_filters.CharFilter(
method="search",
Expand All @@ -255,7 +255,7 @@ class Meta:


class ConfigReplaceFilterSet(GenericPlatformFilterSet):
"""Inherits Base Class CustomFieldModelFilterSet."""
"""Inherits Base Class CustomFieldModelFilterSetMixin."""

q = django_filters.CharFilter(
method="search",
Expand Down