Add an orphaned queryset method to Tags

jazzband · Oct 9, 2024 · 2181a42 · 2181a42
1 parent 5004696
commit 2181a42
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -4,6 +4,8 @@ Changelog
 (Unreleased)
 ~~~~~~~~~~~~
 
+* Add an admin command to remove orphaned tags
+
 6.1.0 (2024-09-29)
 ~~~~~~~~~~~~~~~~~~
 

diff --git a/taggit/admin.py b/taggit/admin.py
@@ -88,7 +88,7 @@ def merge_tags_view(self, request):
     @admin.action(description="Remove orphaned tags")
     def remove_orphaned_tags_action(self, request, queryset):
         try:
-            orphaned_tags = Tag.objects.filter(taggit_taggeditem_items=None)
+            orphaned_tags = queryset.objects.orphaned()
             count, _ = orphaned_tags.delete()
             self.message_user(
                 request, f"Successfully removed {count} orphaned tags.", level="success"

diff --git a/taggit/management/commands/remove_orphaned_tags.py b/taggit/management/commands/remove_orphaned_tags.py
@@ -7,6 +7,6 @@ class Command(BaseCommand):
     help = "Remove orphaned tags"
 
     def handle(self, *args, **options):
-        orphaned_tags = Tag.objects.filter(taggit_taggeditem_items=None)
+        orphaned_tags = Tag.objects.orphaned()
         count = orphaned_tags.delete()
         self.stdout.write(f"Successfully removed {count} orphaned tags")
diff --git a/taggit/models.py b/taggit/models.py
@@ -105,7 +105,16 @@ def slugify(self, tag, i=None):
         return slug
 
 
+class TagQuerySet(models.QuerySet):
+
+    def orphaned(self):
+        return self.filter(taggit_taggeditem_items=None)
+
+
 class Tag(TagBase):
+
+    objects = NaturalKeyManager.from_queryset(TagQuerySet)()
+
     class Meta:
         verbose_name = _("tag")
         verbose_name_plural = _("tags")