more fault-tolerance: avoid errors when title or description is None

This commit is contained in:
Helmut Merz 2011-11-08 13:37:36 +01:00
parent 1738590455
commit 2b29428e32

View file

@ -429,6 +429,8 @@ class IndexAttributes(object):
if self.adaptedIndexAttributes is not None:
return self.adaptedIndexAttributes.text()
description = self.context.description
if description is None:
description = u''
if isinstance(description, I18NValue):
description = ' '.join(description.values())
actx = self.adapted
@ -441,6 +443,8 @@ class IndexAttributes(object):
def title(self):
context = self.context
title = context.title
if title is None:
title = u''
if isinstance(title, I18NValue):
title = ' '.join(title.values())
return ' '.join((getName(context), title)).strip()