dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

have more descriptive messages for username issues

Browse Source
This commit is contained in:
Charles Law
2013-09-21 15:42:10 -04:00
parent 70d8b2d755
commit 27b6319f2e
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/tools.py
+6 -2
View File
@@ -943,6 +943,8 @@ class Auth(object):
registration_verifying='Registration needs verification', registration_verifying='Registration needs verification',
registration_pending='Registration is pending approval', registration_pending='Registration is pending approval',
email_taken='This email already has an account', email_taken='This email already has an account',
invalid_username='Invalid username',
username_taken='Username already taken',
login_disabled='Login disabled by administrator', login_disabled='Login disabled by administrator',
logged_in='Logged in', logged_in='Logged in',
email_sent='Email sent', email_sent='Email sent',
@@ -1662,8 +1664,10 @@ class Auth(object):
settings.table_user_name, []) + signature_list settings.table_user_name, []) + signature_list
if username or settings.cas_provider: if username or settings.cas_provider:
is_unique_username = \ is_unique_username = \
[IS_MATCH('[\w\.\-]+', strict=True), [IS_MATCH('[\w\.\-]+', strict=True,
IS_NOT_IN_DB(db, '%s.username' % settings.table_user_name)] error_message=self.messages.invalid_username),
IS_NOT_IN_DB(db, '%s.username' % settings.table_user_name,
error_message=self.messages.username_taken)]
if not settings.username_case_sensitive: if not settings.username_case_sensitive:
is_unique_username.insert(1, IS_LOWER()) is_unique_username.insert(1, IS_LOWER())
db.define_table( db.define_table(