Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Jul 14, 2024
1 parent 6aef624 commit f68d667
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
4 changes: 2 additions & 2 deletions docs/admin.rst
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ method to the :class:`~django.contrib.admin.ModelAdmin`, using
Merging tags in the admin
=======================

Functionality has been added to the admin app to allow for tag "merging".
Functionality has been added to the admin app to allow for tag "merging".
Really what is happening is a "find and replace" where the selected tags are being used.

To merge your tags follow these steps:
Expand All @@ -54,4 +54,4 @@ To merge your tags follow these steps:
3. Use the dropdown action list and select `Merge selected tags` and then click `Go`
4. This will redirect you onto a new page where you can insert the new tag name.
5. Click `Merge Tags`
6. This will redirect you back to the tag list
6. This will redirect you back to the tag list
5 changes: 1 addition & 4 deletions taggit/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@ def get_urls(self):
]
return custom_urls + urls

@admin.action(
description="Merge selected tags"
)
@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:
Expand Down Expand Up @@ -84,4 +82,3 @@ def merge_tags_view(self, request):
}

return render(request, "admin/taggit/merge_tags_form.html", context)

0 comments on commit f68d667

Please sign in to comment.