Merge branch 'develop' into develop-2.6

This commit is contained in:
Jeremy Stretch
2019-03-05 13:39:00 -05:00
9 changed files with 62 additions and 56 deletions

View File

@@ -5,6 +5,15 @@ from django.db.models import Q
from extras.models import Tag
class TreeNodeMultipleChoiceFilter(django_filters.ModelMultipleChoiceFilter):
"""
Filters for a set of Models, including all descendant models within a Tree. Example: [<Region: R1>,<Region: R2>]
"""
def filter(self, qs, value):
value = [node.get_descendants(include_self=True) for node in value]
return super().filter(qs, value)
class NumericInFilter(django_filters.BaseInFilter, django_filters.NumberFilter):
"""
Filters for a set of numeric values. Example: id__in=100,200,300