From fde7cb966d7d3580cdd016d41e157278e8a00bf9 Mon Sep 17 00:00:00 2001 From: jordan Date: Wed, 7 Sep 2011 12:37:15 +0000 Subject: [PATCH] start awarding users who validate their emails with a badge, include email validation into the actions stream git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1170 0cfe37f9-358a-4d5e-be75-b63607b5c754 --- forum/views/auth.py | 4 ++-- forum_modules/default_badges/badges.py | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/forum/views/auth.py b/forum/views/auth.py index 1b18d6c..c9f3111 100644 --- a/forum/views/auth.py +++ b/forum/views/auth.py @@ -14,6 +14,7 @@ from django.contrib.auth import login, logout from writers import manage_pending_data +from forum.actions import EmailValidationAction from forum.utils import html from forum.views.decorators import login_required from forum.modules import decorate @@ -296,8 +297,7 @@ def validate_email(request, user, code): user = get_object_or_404(User, id=user) if (ValidationHash.objects.validate(code, user, 'email', [user.email])): - user.email_isvalid = True - user.save() + EmailValidationAction(user=user, ip=request.META['REMOTE_ADDR']).save() return login_and_forward(request, user, reverse('index'), _("Thank you, your email is now validated.")) else: return render_to_response('auth/mail_already_validated.html', { 'user' : user }, RequestContext(request)) diff --git a/forum_modules/default_badges/badges.py b/forum_modules/default_badges/badges.py index 893d32a..f9da788 100644 --- a/forum_modules/default_badges/badges.py +++ b/forum_modules/default_badges/badges.py @@ -320,3 +320,11 @@ class Taxonomist(AbstractBadge): def award_to(self, action): return None +class ValidatedEmail(AbstractBadge): + type = Badge.BRONZE + listen_to = (EmailValidationAction,) + name = _("Validated Email") + description = _("User who has validated email associated to the account") + + def award_to(self, action): + return action.user \ No newline at end of file -- 2.45.1