diff --git a/cybertools/composer/schema/grid/field.py b/cybertools/composer/schema/grid/field.py index 1310e7e..f6c4a17 100644 --- a/cybertools/composer/schema/grid/field.py +++ b/cybertools/composer/schema/grid/field.py @@ -167,7 +167,7 @@ class RecordsFieldInstance(GridFieldInstance): def marshall(self, value): result = [] value = value or [] - cardinality = getattr(self.context, 'cardinality', None) + cardinality = getattr(self.context, 'cardinality', None) or 0 for row in value: item = {} for fi in self.columnFieldInstances: diff --git a/cybertools/util/html.py b/cybertools/util/html.py index 4e18bee..3e84a4c 100644 --- a/cybertools/util/html.py +++ b/cybertools/util/html.py @@ -24,6 +24,8 @@ sentencePattern = re.compile(r'[:.\?\!]') def sanitize(value, validTags=validTags, validAttrs=validAttrs, validStyles=validStyles, stripEscapedComments=True): + if value is None: + return '' soup = BeautifulSoup(value, features='lxml') for comment in soup.findAll(string=lambda text: isinstance(text, Comment)): comment.extract()