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

Merge branch 'master' of github.com:web2py/web2py

Browse Source
This commit is contained in:
mdipierro
2019-09-09 21:13:20 -07:00
parent 0f638f9cdf d84cbf8763
commit 91fd094790
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/welcome/static/js/web2py.js
+1 -1
View File
@@ -335,7 +335,7 @@
} else { } else {
formData = form.serialize(); // Fallback for older browsers. formData = form.serialize(); // Fallback for older browsers.
} }
web2py.ajax_page('post', url, formData, target, form); web2py.ajax_page('post', url, formData, target);
e.preventDefault(); e.preventDefault();
}); });
gluon/contrib/simplejsonrpc.py
+1 -1
View File
@@ -30,7 +30,7 @@ else:
from io import StringIO from io import StringIO
import random import random
import json import json
from gluon._compat import basestring
class JSONRPCError(RuntimeError): class JSONRPCError(RuntimeError):
"Error object for remote procedure call fail" "Error object for remote procedure call fail"
gluon/tools.py
+2 -2
View File
@@ -3171,12 +3171,12 @@ class Auth(AuthAPI):
formname='retrieve_password', dbio=False, formname='retrieve_password', dbio=False,
onvalidation=onvalidation, hideerror=self.settings.hideerror): onvalidation=onvalidation, hideerror=self.settings.hideerror):
user = table_user(email=form.vars.email) user = table_user(email=form.vars.email)
key = user.registration_key
if not user: if not user:
current.session.flash = \ current.session.flash = \
self.messages.invalid_email self.messages.invalid_email
redirect(self.url(args=request.args)) redirect(self.url(args=request.args))
elif key in ('pending', 'disabled', 'blocked') or (key or '').startswith('pending'): key = user.registration_key
if key in ('pending', 'disabled', 'blocked') or (key or '').startswith('pending'):
current.session.flash = \ current.session.flash = \
self.messages.registration_pending self.messages.registration_pending
redirect(self.url(args=request.args)) redirect(self.url(args=request.args))