Skip to content

Commit

Permalink
Merge pull request #1822 from MTG/bookmarks-post
Browse files Browse the repository at this point in the history
Require bookmark delete operations to use POST
  • Loading branch information
ffont authored Feb 11, 2025
2 parents 131ecae + 67037eb commit 59e31e5
Showing 1 changed file with 22 additions and 16 deletions.
38 changes: 22 additions & 16 deletions bookmarks/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,16 @@ def bookmarks_for_user(request, username, category_id=None):
@login_required
@transaction.atomic()
def delete_bookmark_category(request, category_id):
category = get_object_or_404(BookmarkCategory, id=category_id, user=request.user)
msg = "Removed bookmark category \"" + category.name + "\"."
category.delete()
messages.add_message(request, messages.WARNING, msg)
next = request.GET.get("next", "")
if next:
return HttpResponseRedirect(next)
if request.method == "POST":
category = get_object_or_404(BookmarkCategory, id=category_id, user=request.user)
msg = f"""Removed bookmark category "{category.name}"."""
category.delete()
messages.add_message(request, messages.WARNING, msg)
next = request.POST.get("next", "")
if next:
return HttpResponseRedirect(next)
else:
return HttpResponseRedirect(reverse("bookmarks-for-user", args=[request.user.username]))
else:
return HttpResponseRedirect(reverse("bookmarks-for-user", args=[request.user.username]))

Expand Down Expand Up @@ -167,16 +170,19 @@ def add_bookmark(request, sound_id):

@login_required
def delete_bookmark(request, bookmark_id):
bookmark = get_object_or_404(Bookmark, id=bookmark_id, user=request.user)
msg = "Removed bookmark for sound \"" + bookmark.sound.original_filename + "\"."
bookmark.delete()
messages.add_message(request, messages.WARNING, msg)
next = request.GET.get("next", "")
page = request.GET.get("page", "1")
if next:
return HttpResponseRedirect(next + "?page=" + str(page))
if request.method == "POST":
bookmark = get_object_or_404(Bookmark, id=bookmark_id, user=request.user)
msg = f"""Removed bookmark for sound "{bookmark.sound.original_filename}"."""
bookmark.delete()
messages.add_message(request, messages.WARNING, msg)
next = request.POST.get("next", "")
page = request.POST.get("page", "1")
if next:
return HttpResponseRedirect(next + "?page=" + str(page))
else:
return HttpResponseRedirect(reverse("bookmarks-for-user", args=[request.user.username]) + "?page=" + str(page))
else:
return HttpResponseRedirect(reverse("bookmarks-for-user", args=[request.user.username]) + "?page=" + str(page))
return HttpResponseRedirect(reverse("bookmarks-for-user", args=[request.user.username]))


def get_form_for_sound(request, sound_id):
Expand Down

0 comments on commit 59e31e5

Please sign in to comment.