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

If both the username and the email checks fail, warn about both at the same time

Browse Source
This commit is contained in:
Christopher Allan Webber 2011-08-11 20:37:21 -05:00
parent 873e4e9d2d
commit 9f6ea47586
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mediagoblin/auth/views.py
View File

@ -50,14 +50,18 @@ def register(request):
users_with_email = request.db.User.find( users_with_email = request.db.User.find(
{'email': request.POST['email'].lower()}).count() {'email': request.POST['email'].lower()}).count()
extra_validation_passes = True
if users_with_username: if users_with_username:
register_form.username.errors.append( register_form.username.errors.append(
_(u'Sorry, a user with that name already exists.')) _(u'Sorry, a user with that name already exists.'))
elif users_with_email: extra_validation_passes = False
if users_with_email:
register_form.email.errors.append( register_form.email.errors.append(
_(u'Sorry, that email address has already been taken.')) _(u'Sorry, that email address has already been taken.'))
extra_validation_passes = False
else: if extra_validation_passes:
# Create the user # Create the user
user = request.db.User() user = request.db.User()
user['username'] = request.POST['username'].lower() user['username'] = request.POST['username'].lower()