From f31d6c55bef1495e9d2d858f1007bb3f72e7a278 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 29 Apr 2019 14:57:28 -0400 Subject: [PATCH] Fix erroneous merge conflict resolution from v2.5.11 --- netbox/extras/api/views.py | 2 +- netbox/extras/views.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/netbox/extras/api/views.py b/netbox/extras/api/views.py index 58e3f7252..44e010cd2 100644 --- a/netbox/extras/api/views.py +++ b/netbox/extras/api/views.py @@ -149,7 +149,7 @@ class TopologyMapViewSet(ModelViewSet): class TagViewSet(ModelViewSet): queryset = Tag.objects.annotate( - tagged_items=Count('taggit_taggeditem_items', distinct=True) + tagged_items=Count('extras_taggeditem_items', distinct=True) ) serializer_class = serializers.TagSerializer filterset_class = filters.TagFilter diff --git a/netbox/extras/views.py b/netbox/extras/views.py index a06d837d4..9833b7880 100644 --- a/netbox/extras/views.py +++ b/netbox/extras/views.py @@ -29,7 +29,7 @@ from .tables import ConfigContextTable, ObjectChangeTable, TagTable, TaggedItemT class TagListView(ObjectListView): queryset = Tag.objects.annotate( - items=Count('taggit_taggeditem_items', distinct=True) + items=Count('extras_taggeditem_items', distinct=True) ).order_by( 'name' )