mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Merge branch 'develop' into api2

Browse Source 
Conflicts:
	netbox/circuits/filters.py
This commit is contained in:
Jeremy Stretch
2017-03-22 09:48:41 -04:00
parent 1791a5bb11 05b71564d8
commit 04e09c0078
6 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
netbox/tenancy/filters.py
View File

@@ -3,11 +3,12 @@ import django_filters
from django.db.models import Q
from extras.filters import CustomFieldFilterSet
from utilities.filters import NullableModelMultipleChoiceFilter
from utilities.filters import NullableModelMultipleChoiceFilter, NumericInFilter
from .models import Tenant, TenantGroup
class TenantFilter(CustomFieldFilterSet, django_filters.FilterSet):
id__in = NumericInFilter(name='id', lookup_expr='in')
q = django_filters.CharFilter(
method='search',
label='Search',