# HG changeset patch # User Aurelien Campeas # Date 1256051585 -7200 # Node ID e68b8e0143b126b337a48801cb5fe8caa7fd26a0 # Parent d43c9709434df75945b9c730588e9795d8a95424# Parent 122a01751d59ccc24f0e1d73b05b3fac169fe3c3 merge diff -r 122a01751d59 -r e68b8e0143b1 web/__init__.py --- a/web/__init__.py Tue Oct 20 16:53:25 2009 +0200 +++ b/web/__init__.py Tue Oct 20 17:13:05 2009 +0200 @@ -50,8 +50,8 @@ def jsonize(function): def newfunc(*args, **kwargs): + value = function(*args, **kwargs) try: - value = function(*args, **kwargs) return json_dumps(value) except TypeError: return json_dumps(repr(value)) diff -r 122a01751d59 -r e68b8e0143b1 web/views/editforms.py --- a/web/views/editforms.py Tue Oct 20 16:53:25 2009 +0200 +++ b/web/views/editforms.py Tue Oct 20 17:13:05 2009 +0200 @@ -187,7 +187,6 @@ or (role == 'object' and not rschema.has_perm(self.req, 'add', toeid=entity.eid))): - self.wview(rvid, entity.related(str(rschema), role), 'null') return False return True