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

Merge ssh://github.com/web2py/web2py

Browse Source
This commit is contained in:
Michele Comitini
2013-07-23 10:36:47 +02:00
parent 73565a4718 e6271dd5f1
commit cb7a7cec29
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.6.0-development+timestamp.2013.07.22.14.51.29 Version 2.6.0-development+timestamp.2013.07.23.02.04.35
gluon/tools.py
+6 -1
View File
@@ -2046,7 +2046,12 @@ class Auth(object):
### pass ### pass
if next is DEFAULT: if next is DEFAULT:
next = self.next or self.settings.login_next # important for security
next = self.settings.login_next
if self.next:
host = self.next.split('//',1)[-1].split('/')[0]
if host in self.settings.cas_domains:
next = self.next
if onvalidation is DEFAULT: if onvalidation is DEFAULT:
onvalidation = self.settings.login_onvalidation onvalidation = self.settings.login_onvalidation
if onaccept is DEFAULT: if onaccept is DEFAULT:
gluon/validators.py
+1 -3
View File
@@ -351,14 +351,12 @@ class IS_JSON(Validator):
self.error_message = error_message self.error_message = error_message
def __call__(self, value): def __call__(self, value):
if value is None:
return None
try: try:
if self.native_json: if self.native_json:
simplejson.loads(value) # raises error in case of malformed json simplejson.loads(value) # raises error in case of malformed json
return (value, None) # the serialized value is not passed return (value, None) # the serialized value is not passed
return (simplejson.loads(value), None) return (simplejson.loads(value), None)
except JSONErrors, e: except JSONErrors:
return (value, translate(self.error_message)) return (value, translate(self.error_message))
def formatter(self,value): def formatter(self,value):