From 32c1f8d50a065527fcb7f79a1a81924b156ec628 Mon Sep 17 00:00:00 2001 From: Jean-Romain Garnier Date: Fri, 17 Apr 2020 13:17:18 +0200 Subject: [PATCH] Require user_edit permission to resend confirmation email --- users/views.py | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/users/views.py b/users/views.py index 233ddaee..b93bf7f3 100644 --- a/users/views.py +++ b/users/views.py @@ -1030,6 +1030,28 @@ def process_passwd(request, req): ) +def process_email(request, req): + """Process la confirmation de mail, renvoie le formulaire + de validation""" + user = req.user + if request.method == "POST": + with transaction.atomic(), reversion.create_revision(): + user.confirm_mail() + user.save() + reversion.set_comment("Email confirmation") + + req.delete() + messages.success(request, _("The %s address was confirmed." % user.email)) + return redirect(reverse("index")) + + return form( + {"email": user.email, "firstname": user.name, "lastname": user.surname}, + "users/confirm_email.html", + request + ) + + +@can_edit(User) def resend_confirmation_email(request, userid): """ Renvoi du mail de confirmation """ try: @@ -1052,27 +1074,6 @@ def resend_confirmation_email(request, userid): ) -def process_email(request, req): - """Process la confirmation de mail, renvoie le formulaire - de validation""" - user = req.user - if request.method == "POST": - with transaction.atomic(), reversion.create_revision(): - user.confirm_mail() - user.save() - reversion.set_comment("Email confirmation") - - req.delete() - messages.success(request, _("The %s address was confirmed." % user.email)) - return redirect(reverse("index")) - - return form( - {"email": user.email, "firstname": user.name, "lastname": user.surname}, - "users/confirm_email.html", - request - ) - - @login_required def initial_register(request): switch_ip = request.GET.get("switch_ip", None)