Skip to content

erp5
erp5
Commit a1580754 authored by Arnaud Fontaine's avatar Arnaud Fontaine
Browse files
Options

Merge remote-tracking branch 'origin/master' into zope4py2

parents 19cb80e6 968991e7
Pipeline #19929 failed with stage
    in 0 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 3 additions and 1 deletion
    product/ERP5/tests/testBusinessTemplateTwoFileExport.py
    View file @ a1580754
    ...@@ -1081,7 +1081,9 @@ AAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO ...@@ -1081,7 +1081,9 @@ AAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO
    "content_type": "text/html", "content_type": "text/html",
    "output_encoding": "iso-8859-15"} "output_encoding": "iso-8859-15"}
    skin_folder._setObject(page_template_id, ZopePageTemplate( skin_folder._setObject(page_template_id, ZopePageTemplate(
    page_template_id, page_template_text, page_template_kw["content_type"])) page_template_id, page_template_text, page_template_kw["content_type"],
    # When not passed, default to iso-8859-15 on Zope2 and utf-8 on Zope4
    output_encoding=page_template_kw["output_encoding"]))
    self.template.edit(template_skin_id_list=[skin_folder_id+'/'+page_template_id,]) self.template.edit(template_skin_id_list=[skin_folder_id+'/'+page_template_id,])
    ......
    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
    GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7