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 develop-2.5

Browse Source
This commit is contained in:
Jeremy Stretch
2018-11-12 16:03:52 -05:00
parent 59589fdd29 0c33af2140
commit bc8dbfde7c
18 changed files with 195 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
netbox/tenancy/filters.py
View File

@@ -2,7 +2,7 @@ import django_filters
from django.db.models import Q
from extras.filters import CustomFieldFilterSet
from utilities.filters import NumericInFilter
from utilities.filters import NumericInFilter, TagFilter
from .models import Tenant, TenantGroup
@@ -32,9 +32,7 @@ class TenantFilter(CustomFieldFilterSet, django_filters.FilterSet):
to_field_name='slug',
label='Group (slug)',
)
tag = django_filters.CharFilter(
field_name='tags__slug',
)
tag = TagFilter()
class Meta:
model = Tenant