Merge remote branch 'remotes/jwandborg/f403_ability_to_delete'

This commit is contained in:
Christopher Allan Webber
2011-08-30 20:16:47 -05:00
13 changed files with 214 additions and 19 deletions

View File

@@ -44,11 +44,12 @@ def register(request):
if request.method == 'POST' and register_form.validate():
# TODO: Make sure the user doesn't exist already
username = unicode(request.POST['username'].lower())
email = unicode(request.POST['email'].lower())
users_with_username = request.db.User.find(
{'username': request.POST['username'].lower()}).count()
{'username': username}).count()
users_with_email = request.db.User.find(
{'email': request.POST['email'].lower()}).count()
{'email': email}).count()
extra_validation_passes = True
@@ -64,8 +65,8 @@ def register(request):
if extra_validation_passes:
# Create the user
user = request.db.User()
user['username'] = request.POST['username'].lower()
user['email'] = request.POST['email'].lower()
user['username'] = username
user['email'] = email
user['pw_hash'] = auth_lib.bcrypt_gen_password_hash(
request.POST['password'])
user.save(validate=True)