merge stable
authorAurelien Campeas <aurelien.campeas@logilab.fr>
Tue, 20 Oct 2009 17:13:05 +0200
branchstable
changeset 3759 e68b8e0143b1
parent 3758 d43c9709434d (diff)
parent 3757 122a01751d59 (current diff)
child 3760 9d93faa0e6dc
merge
--- 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))
--- 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