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/10/15 12:56:13 UTC
[03/12] 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/bae9adb2
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/bae9adb2
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/bae9adb2
Branch: refs/heads/je/42cc_7704
Commit: bae9adb2f3a682b8f40a38f4b8b2f8b1cdd734b9
Parents: 0ca83a6
Author: Aleksey 'LXj' Alekseyev <go...@gmail.com>
Authored: Tue Oct 7 20:45:43 2014 +0300
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Wed Oct 15 11:24:54 2014 +0300
----------------------------------------------------------------------
Allura/allura/controllers/auth.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/bae9adb2/Allura/allura/controllers/auth.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/auth.py b/Allura/allura/controllers/auth.py
index 526fb4d..5900e82 100644
--- a/Allura/allura/controllers/auth.py
+++ b/Allura/allura/controllers/auth.py
@@ -266,7 +266,11 @@ class AuthController(BaseController):
})
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')