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

Base manager for Tag should use RestrictedQuerySet

Browse Source
This commit is contained in:
Jeremy Stretch
2020-06-29 14:57:29 -04:00
parent 66703d8963
commit 36498c9dd2
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

3
netbox/extras/models/tags.py
View File

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

14
netbox/extras/views.py
View File

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