heckyel/mediagoblin
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Dot-Notation for Users.username

Browse Source
This commit is contained in:
Elrond
2011-11-14 15:39:57 +01:00
parent 5b5b67cd5c
commit 5a4e3ff1e2
14 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mediagoblin/auth/lib.py
View File

@@ -105,7 +105,7 @@ def send_verification_email(user, request):
"""
rendered_email = render_template(
request, 'mediagoblin/auth/verification_email.txt',
{'username': user['username'],
{'username': user.username,
'verification_url': EMAIL_VERIFICATION_TEMPLATE.format(
host=request.host,
uri=request.urlgen('mediagoblin.auth.verify_email'),
@@ -140,7 +140,7 @@ def send_fp_verification_email(user, request):
"""
rendered_email = render_template(
request, 'mediagoblin/auth/fp_verification_email.txt',
{'username': user['username'],
{'username': user.username,
'verification_url': EMAIL_FP_VERIFICATION_TEMPLATE.format(
host=request.host,
uri=request.urlgen('mediagoblin.auth.verify_forgot_password'),

10
mediagoblin/auth/views.py
View File

@@ -80,7 +80,7 @@ def register(request):
if extra_validation_passes:
# Create the user
user = request.db.User()
user['username'] = username
user.username = username
user['email'] = email
user['pw_hash'] = auth_lib.bcrypt_gen_password_hash(
request.POST['password'])
@@ -98,7 +98,7 @@ def register(request):
# message waiting for them to verify their email
return redirect(
request, 'mediagoblin.user_pages.user_home',
user=user['username'])
user=user.username)
return render_to_response(
request,
@@ -186,7 +186,7 @@ def verify_email(request):
return redirect(
request, 'mediagoblin.user_pages.user_home',
user=user['username'])
user=user.username)
def resend_activation(request):
@@ -224,7 +224,7 @@ def resend_activation(request):
_('Resent your verification email.'))
return redirect(
request, 'mediagoblin.user_pages.user_home',
user=request.user['username'])
user=request.user.username)
def forgot_password(request):
@@ -268,7 +268,7 @@ def forgot_password(request):
return redirect(
request, 'mediagoblin.user_pages.user_home',
user=user['username'])
user=user.username)
# do not reveal whether or not there is a matching user
return redirect(request, 'mediagoblin.auth.fp_email_sent')