Merge branch 'develop' into develop-2.7

2020-01-03 14:21:53 -05:00
parent 1d63a30b7a feb04f0401
commit 6e49a0ba6e
10 changed files with 333 additions and 40 deletions
--- a/netbox/circuits/filters.py
+++ b/netbox/circuits/filters.py
@@ -18,6 +18,17 @@ class ProviderFilter(CustomFieldFilterSet, CreatedUpdatedFilterSet):
        method='search',
        label='Search',
    )
+    region_id = TreeNodeMultipleChoiceFilter(
+        queryset=Region.objects.all(),
+        field_name='circuits__terminations__site__region__in',
+        label='Region (ID)',
+    )
+    region = TreeNodeMultipleChoiceFilter(
+        queryset=Region.objects.all(),
+        field_name='circuits__terminations__site__region__in',
+        to_field_name='slug',
+        label='Region (slug)',
+    )
    site_id = django_filters.ModelMultipleChoiceFilter(
        field_name='circuits__terminations__site',
        queryset=Site.objects.all(),