Commit 6e6a384c authored by Nicolas Delaby's avatar Nicolas Delaby

Fix string encoding

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18623 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 4d535d4a
...@@ -2335,11 +2335,15 @@ class PortalTypeRolesTemplateItem(BaseTemplateItem): ...@@ -2335,11 +2335,15 @@ class PortalTypeRolesTemplateItem(BaseTemplateItem):
'base_category_script'): 'base_category_script'):
prop_value = role.get(property) prop_value = role.get(property)
if prop_value: if prop_value:
if isinstance(prop_value, str):
prop_value = prop_value.decode('utf-8')
xml_data += "\n <property id='%s'>%s</property>" % \ xml_data += "\n <property id='%s'>%s</property>" % \
(property, prop_value) (property, prop_value)
# multi # multi
for property in ('category', 'base_category'): for property in ('category', 'base_category'):
for prop_value in role.get(property, []): for prop_value in role.get(property, []):
if isinstance(prop_value, str):
prop_value = prop_value.decode('utf-8')
xml_data += "\n <multi_property "\ xml_data += "\n <multi_property "\
"id='%s'>%s</multi_property>" % (property, prop_value) "id='%s'>%s</multi_property>" % (property, prop_value)
xml_data += "\n </role>" xml_data += "\n </role>"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment