Base manager for Tag should use RestrictedQuerySet

netbox/extras/api/views.py

@@ -108,7 +108,7 @@ class ExportTemplateViewSet(ModelViewSet):
 #
 
 class TagViewSet(ModelViewSet):
-    queryset = Tag.restricted.annotate(
+    queryset = Tag.objects.annotate(
         tagged_items=Count('extras_taggeditem_items', distinct=True)
     )
     serializer_class = serializers.TagSerializer

netbox/extras/models/tags.py

@@ -22,8 +22,7 @@ class Tag(TagBase, ChangeLoggedModel):
         blank=True,
     )
 
-    objects = models.Manager()
-    restricted = RestrictedQuerySet.as_manager()
+    objects = RestrictedQuerySet.as_manager()
 
     csv_headers = ['name', 'slug', 'color', 'description']
 

netbox/extras/views.py

@@ -30,7 +30,7 @@ from .scripts import get_scripts, run_script
 #
 
 class TagListView(ObjectListView):
-    queryset = Tag.restricted.annotate(
+    queryset = Tag.objects.annotate(
         items=Count('extras_taggeditem_items', distinct=True)
     ).order_by(
         'name'
@@ -41,7 +41,7 @@ class TagListView(ObjectListView):
 
 
 class TagView(ObjectView):
-    queryset = Tag.restricted.all()
+    queryset = Tag.objects.all()
 
     def get(self, request, slug):
 
@@ -68,26 +68,26 @@ class TagView(ObjectView):
 
 
 class TagEditView(ObjectEditView):
-    queryset = Tag.restricted.all()
+    queryset = Tag.objects.all()
     model_form = forms.TagForm
     default_return_url = 'extras:tag_list'
     template_name = 'extras/tag_edit.html'
 
 
 class TagDeleteView(ObjectDeleteView):
-    queryset = Tag.restricted.all()
+    queryset = Tag.objects.all()
     default_return_url = 'extras:tag_list'
 
 
 class TagBulkImportView(BulkImportView):
-    queryset = Tag.restricted.all()
+    queryset = Tag.objects.all()
     model_form = forms.TagCSVForm
     table = tables.TagTable
     default_return_url = 'extras:tag_list'
 
 
 class TagBulkEditView(BulkEditView):
-    queryset = Tag.restricted.annotate(
+    queryset = Tag.objects.annotate(
         items=Count('extras_taggeditem_items', distinct=True)
     ).order_by(
         'name'
@@ -98,7 +98,7 @@ class TagBulkEditView(BulkEditView):
 
 
 class TagBulkDeleteView(BulkDeleteView):
-    queryset = Tag.restricted.annotate(
+    queryset = Tag.objects.annotate(
         items=Count('extras_taggeditem_items')
     ).order_by(
         'name'