marshall individual values in grid

git-svn-id: svn://svn.cy55.de/Zope3/src/cybertools/trunk@3120 fd906abe-77d9-0310-91a1-e0d9ade77398
This commit is contained in:
helmutm 2009-01-06 16:44:06 +00:00
parent 3f41ede717
commit 230f22ae08
2 changed files with 6 additions and 4 deletions

View file

@ -187,6 +187,7 @@ class NumberFieldInstance(FieldInstance):
if not value: if not value:
return None return None
try: try:
#return int(str(value))
return int(value) return int(value)
except (TypeError, ValueError): except (TypeError, ValueError):
return float(value) return float(value)

View file

@ -59,12 +59,13 @@ class GridFieldInstance(ListFieldInstance):
def marshall(self, value): def marshall(self, value):
if isinstance(value, basestring): if isinstance(value, basestring):
return value return value
# TODO: marshall values!
v = value or [] v = value or []
for row in v: for row in v:
for k, vr in row.items(): #for k, vr in row.items():
if isinstance(vr, basestring): for fi in self.columnFieldInstances:
row[k] = vr.replace('\n', '\\n').replace('"', '\\"') vr = fi.marshall(row[fi.name])
#if isinstance(vr, basestring):
row[fi.name] = vr.replace('\n', '\\n').replace('"', '\\"')
empty = {} empty = {}
for fi in self.columnFieldInstances: for fi in self.columnFieldInstances:
default = fi.default default = fi.default