cco/cybertools
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix bugs on schema field display

Browse source 
git-svn-id: svn://svn.cy55.de/Zope3/src/cybertools/trunk@2948 fd906abe-77d9-0310-91a1-e0d9ade77398
This commit is contained in:
helmutm 2008-10-27 14:20:42 +00:00
parent c9f34cd025
commit 8c9326149e
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
composer/schema/field.py
View file

@ -154,7 +154,7 @@ class FieldInstance(object):
#return toStr(value) #return toStr(value)
def display(self, value): def display(self, value):
return value return value or u''
#return toStr(value) #return toStr(value)
def unmarshall(self, value): def unmarshall(self, value):

5
composer/schema/instance.py
View file

@ -55,7 +55,10 @@ class Instance(BaseInstance):
fi = f.getFieldInstance(self) fi = f.getFieldInstance(self)
name = f.name name = f.name
value = getattr(self.context, name) or fi.default value = getattr(self.context, name) or fi.default
value = (mode == 'view' and fi.display(value)) or fi.marshall(value) if mode == 'view':
value = fi.display(value)
else:
value = fi.marshall(value)
result[name] = value result[name] = value
return result return result

10
media/tests.py
View file

@ -18,10 +18,12 @@ dataDir = os.path.join(os.path.dirname(media.__file__), 'testdata')
def clearDataDir(): def clearDataDir():
for fn in os.listdir(dataDir): for fn in os.listdir(dataDir):
path = os.path.join(dataDir, fn) path = os.path.join(dataDir, fn)
if os.path.isdir(path): if not fn.startswith('.'):
for subfn in os.listdir(path): if os.path.isdir(path):
os.unlink(os.path.join(path, subfn)) for subfn in os.listdir(path):
os.rmdir(path) if not subfn.startswith('.'):
os.unlink(os.path.join(path, subfn))
os.rmdir(path)
class Test(unittest.TestCase): class Test(unittest.TestCase):