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

Use RestrictedQuerySet for default Tag manager

This commit is contained in:
Jeremy Stretch
2020-07-23 14:20:56 -04:00
parent 78bb2e12fe
commit 37706f1c87
2 changed files with 7 additions and 8 deletions

View File

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

View File

@ -32,7 +32,7 @@ from .scripts import get_scripts, run_script
# #
class TagListView(ObjectListView): class TagListView(ObjectListView):
queryset = Tag.restricted_objects.annotate( queryset = Tag.objects.annotate(
items=Count('extras_taggeditem_items', distinct=True) items=Count('extras_taggeditem_items', distinct=True)
).order_by( ).order_by(
'name' 'name'
@ -43,23 +43,23 @@ class TagListView(ObjectListView):
class TagEditView(ObjectEditView): class TagEditView(ObjectEditView):
queryset = Tag.restricted_objects.all() queryset = Tag.objects.all()
model_form = forms.TagForm model_form = forms.TagForm
template_name = 'extras/tag_edit.html' template_name = 'extras/tag_edit.html'
class TagDeleteView(ObjectDeleteView): class TagDeleteView(ObjectDeleteView):
queryset = Tag.restricted_objects.all() queryset = Tag.objects.all()
class TagBulkImportView(BulkImportView): class TagBulkImportView(BulkImportView):
queryset = Tag.restricted_objects.all() queryset = Tag.objects.all()
model_form = forms.TagCSVForm model_form = forms.TagCSVForm
table = tables.TagTable table = tables.TagTable
class TagBulkEditView(BulkEditView): class TagBulkEditView(BulkEditView):
queryset = Tag.restricted_objects.annotate( queryset = Tag.objects.annotate(
items=Count('extras_taggeditem_items', distinct=True) items=Count('extras_taggeditem_items', distinct=True)
).order_by( ).order_by(
'name' 'name'
@ -69,7 +69,7 @@ class TagBulkEditView(BulkEditView):
class TagBulkDeleteView(BulkDeleteView): class TagBulkDeleteView(BulkDeleteView):
queryset = Tag.restricted_objects.annotate( queryset = Tag.objects.annotate(
items=Count('extras_taggeditem_items') items=Count('extras_taggeditem_items')
).order_by( ).order_by(
'name' 'name'