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

Merge branch 'master' of https://github.com/web2py/web2py into pydal-pip

Browse Source 
Conflicts:
	gluon/dal/_load.py
This commit is contained in:
gi0baro
2015-01-22 14:49:07 +01:00
parent ff43ab7a20 a2f5d1cfc5
commit 7d6e473cd0
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/admin.py
+1 -1
View File
@@ -121,7 +121,7 @@ def app_cleanup(app, request):
if os.path.exists(path): if os.path.exists(path):
for f in os.listdir(path): for f in os.listdir(path):
try: try:
if f[:1] != '.': os.unlink(os.path.join(path, f)) if f[:1] != '.': recursive_unlink(os.path.join(path, f))
except IOError: except IOError:
r = False r = False
return r return r
gluon/tools.py
+5
View File
@@ -3097,10 +3097,15 @@ class Auth(object):
IS_EMAIL(error_message=self.messages.invalid_email), IS_EMAIL(error_message=self.messages.invalid_email),
IS_IN_DB(self.db, table_user.email, IS_IN_DB(self.db, table_user.email,
error_message=self.messages.invalid_email)] error_message=self.messages.invalid_email)]
if not self.settings.email_case_sensitive:
table_user.email.requires.insert(0, IS_LOWER())
else: else:
table_user.username.requires = [ table_user.username.requires = [
IS_IN_DB(self.db, table_user.username, IS_IN_DB(self.db, table_user.username,
error_message=self.messages.invalid_username)] error_message=self.messages.invalid_username)]
if not self.settings.username_case_sensitive:
table_user.username.requires.insert(0, IS_LOWER())
form = SQLFORM(table_user, form = SQLFORM(table_user,
fields=[userfield], fields=[userfield],
hidden=dict(_next=next), hidden=dict(_next=next),