rattail/appypod-rattail
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

[gen] Bugfixes.

Browse source
This commit is contained in:
Gaetan Delannay 2014-02-27 20:03:39 +01:00
parent fe56ee27a0
commit f7172be6ee
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
fields/computed.py
View file

@ -20,6 +20,8 @@ from appy.px import Px
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
class Computed(Field): class Computed(Field):
WRONG_METHOD = 'Wrong value "%s". Param "method" must contain a method ' \
'or a PX.'
# Ajax-called view content of a non sync Computed field. # Ajax-called view content of a non sync Computed field.
pxViewContent = Px(''' pxViewContent = Px('''
@ -53,6 +55,9 @@ class Computed(Field):
context=None): context=None):
# The Python method used for computing the field value, or a PX. # The Python method used for computing the field value, or a PX.
self.method = method self.method = method
if isinstance(self.method, basestring):
# A legacy macro identifier. Raise an exception
raise Exception(self.WRONG_METHOD % self.method)
# Does field computation produce plain text or XHTML? # Does field computation produce plain text or XHTML?
self.plainText = plainText self.plainText = plainText
if isinstance(method, Px): if isinstance(method, Px):
@ -74,8 +79,15 @@ class Computed(Field):
if isinstance(self.method, Px): if isinstance(self.method, Px):
obj = obj.appy() obj = obj.appy()
tool = obj.tool tool = obj.tool
ctx = {'obj': obj, 'field': self, 'req': obj.request, 'tool': tool, req = obj.request
'_': tool.translate, 'url': tool.o.getIncludeUrl} # Get the context of the currently executed PX if present
try:
ctx = req.pxContext
except AttributeError:
# Create some standard context
ctx = {'obj': obj, 'zobj': obj.o, 'field': self,
'req': req, 'tool': tool, 'ztool': tool.o,
'_': tool.translate, 'url': tool.o.getIncludeUrl}
if self.context: ctx.update(self.context) if self.context: ctx.update(self.context)
return self.method(ctx) return self.method(ctx)
else: else: