From d70ef4d3b38236979a15c42dee58d1a6ec946689 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 3 Jul 2018 09:47:44 -0400 Subject: [PATCH] Cleaned up tags table --- netbox/extras/tables.py | 2 +- netbox/extras/views.py | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/netbox/extras/tables.py b/netbox/extras/tables.py index 364da9ebb..8e35e5247 100644 --- a/netbox/extras/tables.py +++ b/netbox/extras/tables.py @@ -53,7 +53,7 @@ class TagTable(BaseTable): class Meta(BaseTable.Meta): model = Tag - fields = ('pk', 'name', 'weight') + fields = ('pk', 'name', 'items', 'slug', 'actions') class ConfigContextTable(BaseTable): diff --git a/netbox/extras/views.py b/netbox/extras/views.py index 632b21177..4defeb3c1 100644 --- a/netbox/extras/views.py +++ b/netbox/extras/views.py @@ -6,7 +6,7 @@ from django.contrib.auth.mixins import PermissionRequiredMixin from django.contrib.contenttypes.models import ContentType from django.db.models import Count, Q from django.http import Http404 -from django.shortcuts import get_object_or_404, redirect, render, reverse +from django.shortcuts import get_object_or_404, redirect, render from django.utils.safestring import mark_safe from django.views.generic import View from taggit.models import Tag @@ -34,9 +34,7 @@ class TagEditView(PermissionRequiredMixin, ObjectEditView): permission_required = 'taggit.change_tag' model = Tag model_form = TagForm - - def get_return_url(self, request, obj): - return reverse('extras:tag', kwargs={'slug': obj.slug}) + default_return_url = 'extras:tag_list' class TagDeleteView(PermissionRequiredMixin, ObjectDeleteView):