Skip to content

erp5
erp5
Commit ca85a1c9 authored by Georgios Dagkakis's avatar Georgios Dagkakis
Browse files
Options

erp5_hal_json_style: Make sure that keys in parallel_list_field are translated 

To be compatible with xhtml, where in hash scripts like Base_getMultiListFieldPropertyDictList
the category titles are not translated and translation happens in form rendering

Also:
erp5_web_renderjs_ui_test: Add testParallelFieldListTranslation

to check the translation of category titles in parallel list field
parent e08ace32
Pipeline #17369 failed with stage
    in 0 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 120 additions and 0 deletions
    bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/ERP5Document_getHateoas.py
    View file @ ca85a1c9
    ...@@ -534,6 +534,8 @@ def renderField(traversed_document, field, form, value=MARKER, meta_type=None, ...@@ -534,6 +534,8 @@ def renderField(traversed_document, field, form, value=MARKER, meta_type=None,
    for subdict in result['subfield_list']: for subdict in result['subfield_list']:
    if subdict['title'] == ' ': if subdict['title'] == ' ':
    subdict['title'] = '' subdict['title'] = ''
    if subdict['title']:
    subdict['title'] = Base_translateString(subdict['title'])
    subdict['items'] = subdict['item_list'] subdict['items'] = subdict['item_list']
    del subdict['item_list'] del subdict['item_list']
    subdict['key'] = field.generate_subfield_key( subdict['key'] = field.generate_subfield_key(
    ......
    bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_translate_zuite/testParallelFieldListTranslation.xml 0 → 100644
    View file @ ca85a1c9
    <?xml version="1.0"?>
    <ZopeData>
    <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
    <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>_bind_names</string> </key>
    <value>
    <object>
    <klass>
    <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
    </klass>
    <tuple/>
    <state>
    <dictionary>
    <item>
    <key> <string>_asgns</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>name_subpath</string> </key>
    <value> <string>traverse_subpath</string> </value>
    </item>
    </dictionary>
    </value>
    </item>
    </dictionary>
    </state>
    </object>
    </value>
    </item>
    <item>
    <key> <string>content_type</string> </key>
    <value> <string>text/html</string> </value>
    </item>
    <item>
    <key> <string>expand</string> </key>
    <value> <int>0</int> </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>testParallelFieldListTranslation</string> </value>
    </item>
    <item>
    <key> <string>output_encoding</string> </key>
    <value> <string>utf-8</string> </value>
    </item>
    <item>
    <key> <string>title</string> </key>
    <value> <unicode></unicode> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_translate_zuite/testParallelFieldListTranslation.zpt 0 → 100644
    View file @ ca85a1c9
    <html xmlns:tal="http://xml.zope.org/namespaces/tal"
    xmlns:metal="http://xml.zope.org/namespaces/metal">
    <head>
    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
    <title>Test RenderJS UI</title>
    </head>
    <body>
    <table cellpadding="1" cellspacing="1" border="1">
    <thead>
    <tr><td rowspan="1" colspan="3">Test RenderJS UI</td></tr>
    </thead><tbody>
    <tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/init" />
    <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/create_translation_data" />
    <!-- Initialize -->
    <tr>
    <td>open</td>
    <td>${base_url}/web_site_module/renderjs_runner/wo/#/foo_module</td>
    <td></td>
    </tr>
    <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_app_loaded" />
    <tal:block tal:define="click_configuration python: {'text': 'zhenjia'}">
    <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/click_on_header_link" />
    </tal:block>
    <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" />
    <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/submit_dialog" />
    <tal:block tal:define="notification_configuration python: {'class': 'success',
    'text': 'Object created.'}">
    <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_notification" />
    </tal:block>
    <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" />
    <!-- Go to test form -->
    <tal:block tal:define="click_configuration python: {'text': 'Parallel List Field'}">
    <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/click_on_panel_link" />
    </tal:block>
    <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" />
    <!-- Select single validator key -->
    <tr>
    <td>click</td>
    <td>//label[contains(text(), 'Base_getMultiListFieldPropertyDictList')]</td>
    <td></td>
    </tr>
    <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/click_save" />
    <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" />
    <!-- Check that Category titles in parallel_list_field are well translated -->
    <tr>
    <td>assertText</td>
    <td>//div[@data-gadget-scope='field_my_category_list']//div[@data-gadget-scope='PARALLEL_SUB_FIELD_1']//div//label</td>
    <td>Foo leibie</td>
    </tr>
    </tbody></table>
    </body>
    </html>
    \ No newline at end of file
    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