heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dot-Notation for Users.email

Browse Source
This commit is contained in:
Elrond 2011-11-14 17:22:33 +01:00
parent 5a4e3ff1e2
commit 809cbfc5ab
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mediagoblin/auth/lib.py
View File

@ -115,7 +115,7 @@ def send_verification_email(user, request):
# TODO: There is no error handling in place # TODO: There is no error handling in place
send_email( send_email(
mg_globals.app_config['email_sender_address'], mg_globals.app_config['email_sender_address'],
[user['email']], [user.email],
# TODO # TODO
# Due to the distributed nature of GNU MediaGoblin, we should # Due to the distributed nature of GNU MediaGoblin, we should
# find a way to send some additional information about the # find a way to send some additional information about the
@ -150,6 +150,6 @@ def send_fp_verification_email(user, request):
# TODO: There is no error handling in place # TODO: There is no error handling in place
send_email( send_email(
mg_globals.app_config['email_sender_address'], mg_globals.app_config['email_sender_address'],
[user['email']], [user.email],
'GNU MediaGoblin - Change forgotten password!', 'GNU MediaGoblin - Change forgotten password!',
rendered_email) rendered_email)

2
mediagoblin/auth/views.py
View File

@ -81,7 +81,7 @@ def register(request):
# Create the user # Create the user
user = request.db.User() user = request.db.User()
user.username = username user.username = username
user['email'] = email user.email = email
user['pw_hash'] = auth_lib.bcrypt_gen_password_hash( user['pw_hash'] = auth_lib.bcrypt_gen_password_hash(
request.POST['password']) request.POST['password'])
user.save(validate=True) user.save(validate=True)

2
mediagoblin/gmg_commands/users.py
View File

@ -51,7 +51,7 @@ def adduser(args):
# Create the user # Create the user
entry = db.User() entry = db.User()
entry.username = unicode(args.username.lower()) entry.username = unicode(args.username.lower())
entry['email'] = unicode(args.email) entry.email = unicode(args.email)
entry['pw_hash'] = auth_lib.bcrypt_gen_password_hash(args.password) entry['pw_hash'] = auth_lib.bcrypt_gen_password_hash(args.password)
entry['status'] = u'active' entry['status'] = u'active'
entry['email_verified'] = True entry['email_verified'] = True

2
mediagoblin/tests/test_tests.py
View File

@ -28,7 +28,7 @@ def test_get_test_app_wipes_db():
new_user = mg_globals.database.User() new_user = mg_globals.database.User()
new_user.username = u'lolcat' new_user.username = u'lolcat'
new_user['email'] = u'lol@cats.example.org' new_user.email = u'lol@cats.example.org'
new_user['pw_hash'] = u'pretend_this_is_a_hash' new_user['pw_hash'] = u'pretend_this_is_a_hash'
new_user.save() new_user.save()
assert mg_globals.database.User.find().count() == 1 assert mg_globals.database.User.find().count() == 1