Merge branch '899-merge-tags' of github.com:jazzband/django-taggit in…

…to 899-merge-tags
jazzband · Jul 14, 2024 · 6aef624 · 6aef624
2 parents 1641737 + 8f98db8
commit 6aef624
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/taggit/admin.py b/taggit/admin.py
@@ -32,6 +32,9 @@ def get_urls(self):
         ]
         return custom_urls + urls
 
+    @admin.action(
+        description="Merge selected tags"
+    )
     def render_tag_form(self, request, queryset):
         selected = request.POST.getlist(admin.helpers.ACTION_CHECKBOX_NAME)
         if not selected:
@@ -82,4 +85,3 @@ def merge_tags_view(self, request):
 
         return render(request, "admin/taggit/merge_tags_form.html", context)
 
-    render_tag_form.short_description = "Merge selected tags"