You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by je...@apache.org on 2014/11/19 15:01:16 UTC
[05/26] allura git commit: [#7704] ticket:662 Clear pending status on
confirming an email address
[#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/a175f3e2
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/a175f3e2
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/a175f3e2
Branch: refs/heads/ib/7794
Commit: a175f3e2aff0d3dee8e8a823eef838078a2a7e16
Parents: 257c383
Author: Aleksey 'LXj' Alekseyev <go...@gmail.com>
Authored: Tue Oct 7 20:45:43 2014 +0300
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Mon Nov 17 19:18:02 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/a175f3e2/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')