Merge branch 'master' into bbmaster

This commit is contained in:
Helmut Merz 2013-12-20 10:23:47 +01:00
commit 452dc0290f

View file

@ -53,7 +53,7 @@ class Instance(BaseInstance):
fi = f.getFieldInstance(self, context=kw.get('context'),
request=kw.get('request'))
name = f.name
value = getattr(self.context, name, fi.default)
value = getattr(self.context, name) or fi.default
if mode in ('view', 'preview'):
value = fi.display(value)
else: