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.10

Browse Source
This commit is contained in:
Jeremy Stretch
2020-11-09 20:58:59 -05:00
parent 652e128cfd 340e665817
commit 0567f0d190
13 changed files with 118 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/extras/querysets.py
View File

@ -42,7 +42,7 @@ class ConfigContextQuerySet(RestrictedQuerySet):
Q(tenants=obj.tenant) | Q(tenants=None),
Q(tags__slug__in=obj.tags.slugs()) | Q(tags=None),
is_active=True,
).order_by('weight', 'name')
).order_by('weight', 'name').distinct()
if aggregate_data:
return queryset.aggregate(
@ -77,7 +77,7 @@ class ConfigContextModelQuerySet(RestrictedQuerySet):
_data=EmptyGroupByJSONBAgg('data', ordering=['weight', 'name'])
).values("_data")
)
)
).distinct()
def _get_config_context_filters(self):
# Construct the set of Q objects for the specific object types