From 9a600b73886fa07055e38f45c506e9c2080a2761 Mon Sep 17 00:00:00 2001
From: helmutm <helmutm@fd906abe-77d9-0310-91a1-e0d9ade77398>
Date: Mon, 27 Aug 2007 17:15:15 +0000
Subject: [PATCH] minor fixes for composer.schema

git-svn-id: svn://svn.cy55.de/Zope3/src/cybertools/trunk@1962 fd906abe-77d9-0310-91a1-e0d9ade77398
---
 composer/schema/field.py    | 10 ++++------
 composer/schema/instance.py |  6 +++---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/composer/schema/field.py b/composer/schema/field.py
index 51bd6f4..27de35f 100644
--- a/composer/schema/field.py
+++ b/composer/schema/field.py
@@ -50,18 +50,16 @@ class Field(Component):
     def name(self):
         return self.__name__
 
-    #@property
-    #def title(self):
-    #    return self.title or self.name
-
     def getTitleValue(self):
         return self.title or self.name
 
     def marshallValue(self, value):
-        return toStr(value)
+        return value
+        #return toStr(value)
 
     def displayValue(self, value):
-        return toStr(value)
+        return value
+        #return toStr(value)
 
     def unmarshallValue(self, strValue):
         return toUnicode(strValue) or u''
diff --git a/composer/schema/instance.py b/composer/schema/instance.py
index ad47fd0..8ca41a7 100644
--- a/composer/schema/instance.py
+++ b/composer/schema/instance.py
@@ -73,9 +73,9 @@ class ClientInstance(object):
         template = self.template
         values = attrs.setdefault(self.aspect, {})
         if template is not None:
-            for c in template.components:
-                name = c.name
-                result[name] = values.get(name, u'')
+            for f in template.fields:
+                name = f.name
+                result[name] = f.displayValue(values.get(name, u''))
         result['__name__'] = self.context.__name__
         return result