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

minor fixes for composer.schema

Browse source 
git-svn-id: svn://svn.cy55.de/Zope3/src/cybertools/trunk@1962 fd906abe-77d9-0310-91a1-e0d9ade77398
This commit is contained in:
helmutm 2007-08-27 17:15:15 +00:00
parent cce4ec33f7
commit 9a600b7388
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
composer/schema/field.py
View file

@ -50,18 +50,16 @@ class Field(Component):
def name(self): def name(self):
return self.__name__ return self.__name__
#@property
#def title(self):
# return self.title or self.name
def getTitleValue(self): def getTitleValue(self):
return self.title or self.name return self.title or self.name
def marshallValue(self, value): def marshallValue(self, value):
return toStr(value) return value
#return toStr(value)
def displayValue(self, value): def displayValue(self, value):
return toStr(value) return value
#return toStr(value)
def unmarshallValue(self, strValue): def unmarshallValue(self, strValue):
return toUnicode(strValue) or u'' return toUnicode(strValue) or u''

6
composer/schema/instance.py
View file

@ -73,9 +73,9 @@ class ClientInstance(object):
template = self.template template = self.template
values = attrs.setdefault(self.aspect, {}) values = attrs.setdefault(self.aspect, {})
if template is not None: if template is not None:
for c in template.components: for f in template.fields:
name = c.name name = f.name
result[name] = values.get(name, u'') result[name] = f.displayValue(values.get(name, u''))
result['__name__'] = self.context.__name__ result['__name__'] = self.context.__name__
return result return result