workflows: process model text as strings (#36515)

This commit is contained in:
Frédéric Péters 2019-11-15 16:39:37 +01:00
parent 091ba4ae15
commit 85a4024417
1 changed files with 2 additions and 4 deletions

View File

@ -30,7 +30,7 @@ from quixote import get_response, get_request, get_publisher
from quixote.directory import Directory
from quixote.html import htmltext
from ..qommon import _, ezt, misc
from ..qommon import _, ezt, misc, force_str
from ..qommon import get_logger
from ..qommon.form import (SingleSelectWidget, WidgetList, CheckboxWidget,
StringWidget, UploadWidget, WysiwygTextWidget, Upload,
@ -421,9 +421,7 @@ class ExportToModel(WorkflowStatusItem):
user_field_values = {}
def process_text(t):
if isinstance(t, unicode):
t = t.encode(get_publisher().site_charset)
t = template_on_context(context, t, autoescape=False)
t = template_on_context(context, force_str(t), autoescape=False)
return force_text(t, get_publisher().site_charset)
for node in root.iter():
got_blank_lines = False