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 v2.5.11

Browse Source
This commit is contained in:
Jeremy Stretch
2019-04-29 14:40:18 -04:00
parent 2c730b08e4 d5dcb77d99
commit 37c2c4b4a2
13 changed files with 103 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/extras/api/views.py
View File

@@ -148,7 +148,9 @@ class TopologyMapViewSet(ModelViewSet):
#
class TagViewSet(ModelViewSet):
queryset = Tag.objects.annotate(tagged_items=Count('extras_taggeditem_items'))
queryset = Tag.objects.annotate(
tagged_items=Count('taggit_taggeditem_items', distinct=True)
)
serializer_class = serializers.TagSerializer
filterset_class = filters.TagFilter