From 57b73c485fa213b8437db7340131822fca4eed26 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 1 Jul 2020 14:21:51 -0400 Subject: [PATCH] #4416: Remove individual view for extras.Tag --- netbox/extras/models/tags.py | 3 --- netbox/extras/tables.py | 4 ---- netbox/extras/tests/test_views.py | 2 +- netbox/extras/urls.py | 1 - netbox/extras/views.py | 27 --------------------------- 5 files changed, 1 insertion(+), 36 deletions(-) diff --git a/netbox/extras/models/tags.py b/netbox/extras/models/tags.py index 9bb90f21e..39ac86073 100644 --- a/netbox/extras/models/tags.py +++ b/netbox/extras/models/tags.py @@ -26,9 +26,6 @@ class Tag(TagBase, ChangeLoggedModel): csv_headers = ['name', 'slug', 'color', 'description'] - def get_absolute_url(self): - return reverse('extras:tag', args=[self.slug]) - def slugify(self, tag, i=None): # Allow Unicode in Tag slugs (avoids empty slugs for Tags with all-Unicode names) slug = slugify(tag, allow_unicode=True) diff --git a/netbox/extras/tables.py b/netbox/extras/tables.py index 79a529059..9d49988e7 100644 --- a/netbox/extras/tables.py +++ b/netbox/extras/tables.py @@ -52,10 +52,6 @@ OBJECTCHANGE_REQUEST_ID = """ class TagTable(BaseTable): pk = ToggleColumn() - name = tables.LinkColumn( - viewname='extras:tag', - args=[Accessor('slug')] - ) color = ColorColumn() actions = ButtonsColumn(Tag, pk_field='slug') diff --git a/netbox/extras/tests/test_views.py b/netbox/extras/tests/test_views.py index b3abf5b22..f14f02e43 100644 --- a/netbox/extras/tests/test_views.py +++ b/netbox/extras/tests/test_views.py @@ -10,7 +10,7 @@ from extras.models import ConfigContext, ObjectChange, Tag from utilities.testing import ViewTestCases, TestCase -class TagTestCase(ViewTestCases.PrimaryObjectViewTestCase): +class TagTestCase(ViewTestCases.OrganizationalObjectViewTestCase): model = Tag @classmethod diff --git a/netbox/extras/urls.py b/netbox/extras/urls.py index 3007e6524..95c0ae8d9 100644 --- a/netbox/extras/urls.py +++ b/netbox/extras/urls.py @@ -13,7 +13,6 @@ urlpatterns = [ path('tags/import/', views.TagBulkImportView.as_view(), name='tag_import'), path('tags/edit/', views.TagBulkEditView.as_view(), name='tag_bulk_edit'), path('tags/delete/', views.TagBulkDeleteView.as_view(), name='tag_bulk_delete'), - path('tags//', views.TagView.as_view(), name='tag'), path('tags//edit/', views.TagEditView.as_view(), name='tag_edit'), path('tags//delete/', views.TagDeleteView.as_view(), name='tag_delete'), path('tags//changelog/', views.ObjectChangeLogView.as_view(), name='tag_changelog', kwargs={'model': Tag}), diff --git a/netbox/extras/views.py b/netbox/extras/views.py index 879ca89d0..921b05792 100644 --- a/netbox/extras/views.py +++ b/netbox/extras/views.py @@ -40,33 +40,6 @@ class TagListView(ObjectListView): table = tables.TagTable -class TagView(ObjectView): - queryset = Tag.objects.all() - - def get(self, request, slug): - - tag = get_object_or_404(self.queryset, slug=slug) - tagged_items = TaggedItem.objects.filter( - tag=tag - ).prefetch_related( - 'content_type', 'content_object' - ) - - # Generate a table of all items tagged with this Tag - items_table = tables.TaggedItemTable(tagged_items) - paginate = { - 'paginator_class': EnhancedPaginator, - 'per_page': request.GET.get('per_page', settings.PAGINATE_COUNT) - } - RequestConfig(request, paginate).configure(items_table) - - return render(request, 'extras/tag.html', { - 'tag': tag, - 'items_count': tagged_items.count(), - 'items_table': items_table, - }) - - class TagEditView(ObjectEditView): queryset = Tag.objects.all() model_form = forms.TagForm