Skip to content

Commit

Permalink
Merge pull request #53 from Kani999/47-multiple-device-types
Browse files Browse the repository at this point in the history
Use proper FilterSet to work with custom fields, etc.
  • Loading branch information
Kani999 authored Jan 9, 2024
2 parents d7de988 + 9a7c33e commit 62581f4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 10 deletions.
14 changes: 5 additions & 9 deletions netbox_attachments/filtersets.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
import django_filters
from django.db.models import Q
from extras.filters import TagFilter
from netbox.filtersets import BaseFilterSet
from netbox.filtersets import NetBoxModelFilterSet
from utilities.filters import ContentTypeFilter

from .models import NetBoxAttachment


class NetBoxAttachmentFilterSet(BaseFilterSet):
q = django_filters.CharFilter(
method='search',
label='Search',
)
class NetBoxAttachmentFilterSet(NetBoxModelFilterSet):
q = django_filters.CharFilter(method='search', label='Search')
created = django_filters.DateTimeFilter()
content_type = ContentTypeFilter()
name = django_filters.CharFilter(lookup_expr="icontains")
Expand All @@ -26,6 +23,5 @@ def search(self, queryset, name, value):
if not value.strip():
return queryset

name_filter = Q(name__icontains=value)
description_filter = Q(description__icontains=value)
return queryset.filter(name_filter | description_filter)
filters = Q(name__icontains=value) | Q(description__icontains=value)
return queryset.filter(filters)
2 changes: 1 addition & 1 deletion netbox_attachments/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "4.0.0"
__version__ = "4.0.1"

0 comments on commit 62581f4

Please sign in to comment.