Closes #927: Upgrade to django-filter 1.0

2017-03-01 13:09:19 -05:00
parent 5ad3044314
commit 1adae67dd7
11 changed files with 225 additions and 158 deletions
--- a/netbox/secrets/filters.py
+++ b/netbox/secrets/filters.py
@@ -7,8 +7,8 @@ from dcim.models import Device


 class SecretFilter(django_filters.FilterSet):
-    q = django_filters.MethodFilter(
-        action='search',
+    q = django_filters.CharFilter(
+        method='search',
        label='Search',
    )
    role_id = django_filters.ModelMultipleChoiceFilter(
@@ -33,7 +33,9 @@ class SecretFilter(django_filters.FilterSet):
        model = Secret
        fields = ['name']

-    def search(self, queryset, value):
+    def search(self, queryset, name, value):
+        if not value.strip():
+            return queryset
        return queryset.filter(
            Q(name__icontains=value) |
            Q(device__name__icontains=value)