1
0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00

Use stock manager as default for Tag model

This commit is contained in:
Jeremy Stretch
2020-07-07 12:18:14 -04:00
parent 15f5719f44
commit a2d957ba0d
6 changed files with 12 additions and 14 deletions

View File

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

View File

@@ -1,5 +1,4 @@
from django.db import models
from django.urls import reverse
from django.utils.text import slugify
from taggit.models import TagBase, GenericTaggedItemBase
@@ -22,7 +21,8 @@ class Tag(TagBase, ChangeLoggedModel):
blank=True,
)
objects = RestrictedQuerySet.as_manager()
objects = models.Manager()
restricted_objects = RestrictedQuerySet.as_manager()
csv_headers = ['name', 'slug', 'color', 'description']

View File

@@ -2,12 +2,10 @@ import time
from django import template
from django.conf import settings
from django.contrib import messages
from django.contrib.contenttypes.models import ContentType
from django.db.models import Count, Prefetch, Q
from django.http import Http404, HttpResponseForbidden
from django.shortcuts import get_object_or_404, redirect, render
from django.utils.safestring import mark_safe
from django.views.generic import View
from django_tables2 import RequestConfig
@@ -33,7 +31,7 @@ from .scripts import get_scripts, run_script
#
class TagListView(ObjectListView):
queryset = Tag.objects.annotate(
queryset = Tag.restricted_objects.annotate(
items=Count('extras_taggeditem_items', distinct=True)
).order_by(
'name'
@@ -44,23 +42,23 @@ class TagListView(ObjectListView):
class TagEditView(ObjectEditView):
queryset = Tag.objects.all()
queryset = Tag.restricted_objects.all()
model_form = forms.TagForm
template_name = 'extras/tag_edit.html'
class TagDeleteView(ObjectDeleteView):
queryset = Tag.objects.all()
queryset = Tag.restricted_objects.all()
class TagBulkImportView(BulkImportView):
queryset = Tag.objects.all()
queryset = Tag.restricted_objects.all()
model_form = forms.TagCSVForm
table = tables.TagTable
class TagBulkEditView(BulkEditView):
queryset = Tag.objects.annotate(
queryset = Tag.restricted_objects.annotate(
items=Count('extras_taggeditem_items', distinct=True)
).order_by(
'name'
@@ -70,7 +68,7 @@ class TagBulkEditView(BulkEditView):
class TagBulkDeleteView(BulkDeleteView):
queryset = Tag.objects.annotate(
queryset = Tag.restricted_objects.annotate(
items=Count('extras_taggeditem_items')
).order_by(
'name'