From cb1784142f77bd24ef96a2df65b231b480fbff5b Mon Sep 17 00:00:00 2001
From: Jean-Romain Garnier <jean-romain.garnier@supelec.fr>
Date: Sat, 18 Apr 2020 01:03:41 +0200
Subject: [PATCH] Cleanup old Request objects in process_passwd and
 process_email

---
 users/views.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/users/views.py b/users/views.py
index 3d5b0205..28fb107c 100644
--- a/users/views.py
+++ b/users/views.py
@@ -1027,7 +1027,8 @@ def process_passwd(request, req):
             u_form.save()
             reversion.set_comment("Password reset")
 
-        req.delete()
+        # Delete all remaining requests
+        Request.objects.filter(user=user, type=Request.PASSWD).delete()
         messages.success(request, _("The password was changed."))
         return redirect(reverse("index"))
     return form(
@@ -1047,7 +1048,8 @@ def process_email(request, req):
             user.save()
             reversion.set_comment("Email confirmation")
 
-        req.delete()
+        # Delete all remaining requests
+        Request.objects.filter(user=user, type=Request.EMAIL).delete()
         messages.success(request, _("The %s address was confirmed." % user.email))
         return redirect(reverse("index"))