allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jetm...@apache.org
Subject [03/17] allura git commit: [#7704] ticket:662 Clear pending status on confirming an email address
Date Wed, 12 Nov 2014 12:15:06 GMT
[#7704] ticket:662 Clear pending status on confirming an email address


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/e997f030
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/e997f030
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/e997f030

Branch: refs/heads/ib/7704
Commit: e997f030f0418086dd883fc7d1368cf2938bc857
Parents: 88aa3f1
Author: Aleksey 'LXj' Alekseyev <gotletter@gmail.com>
Authored: Tue Oct 7 20:45:43 2014 +0300
Committer: Igor Bondarenko <jetmind2@gmail.com>
Committed: Wed Nov 12 10:27:03 2014 +0000

----------------------------------------------------------------------
 Allura/allura/controllers/auth.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/e997f030/Allura/allura/controllers/auth.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/auth.py b/Allura/allura/controllers/auth.py
index 5d966a1..cec2b28 100644
--- a/Allura/allura/controllers/auth.py
+++ b/Allura/allura/controllers/auth.py
@@ -259,7 +259,11 @@ class AuthController(BaseController):
         if addr and not confirmed_by_other:
             addr.confirmed = True
             flash('Email address confirmed')
-            h.auditlog_user('Email address verified: %s', addr.email, user=addr.claimed_by_user())
+            h.auditlog_user('Email address verified: %s',  addr.email, user=addr.claimed_by_user())
+
+            if addr.claimed_by_user.pending:
+                addr.claimed_by_user.pending = False
+                addr.claimed_by_user.m.save()
         else:
             flash('Unknown verification link', 'error')
 


Mime
View raw message