Merge branch 'develop' into develop-2.3

This commit is contained in:
Jeremy Stretch
2018-01-19 10:54:26 -05:00
29 changed files with 186 additions and 113 deletions

View File

@@ -81,7 +81,7 @@ class TenantFilterForm(BootstrapMixin, CustomFieldFilterForm):
group = FilterChoiceField(
queryset=TenantGroup.objects.annotate(filter_count=Count('tenants')),
to_field_name='slug',
null_option=(0, 'None')
null_label='-- None --'
)