From c88082e338616ed8ca41bd993f58554f29ce3f6b Mon Sep 17 00:00:00 2001 From: helmutm Date: Fri, 4 Dec 2009 07:07:10 +0000 Subject: [PATCH] handle empty values correctly - show error info only for non-existing fields git-svn-id: svn://svn.cy55.de/Zope3/src/cybertools/trunk@3644 fd906abe-77d9-0310-91a1-e0d9ade77398 --- composer/message/instance.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/composer/message/instance.py b/composer/message/instance.py index 5925647..b5b6178 100644 --- a/composer/message/instance.py +++ b/composer/message/instance.py @@ -38,6 +38,8 @@ from cybertools.composer.instance import Instance from cybertools.composer.interfaces import IInstance from cybertools.util.jeep import Jeep +_not_found = object() + class DataProvider(object): @@ -98,7 +100,10 @@ class DataProvider(object): instance = IInstance(self.getSubclient(schemaName)) instance.template = schema data = instance.applyTemplate() - return data.get(fieldName) or '$' + key + value = data.get(fieldName, _not_found) + if value is _not_found: + return '$' + key + return value def getSubclient(self, name): return self.context.client