Skip to content

erp5
erp5
Commit f860e578 authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

Repair `cell` in matrixbox TALES context 

This repairs TALES expressions using constructs like `cell is not None` to test if a cell exists, like for example:

https://lab.nexedi.com/nexedi/erp5/blob/1b706b6c29771b5fcbde6499be5df905ca503d5a/bt5/erp5_open_trade/SkinTemplateItem/portal_skins/erp5_open_trade/OpenOrderLine_viewPrice/matrixbox_price.xml#L110


https://lab.nexedi.com/nexedi/erp5/blob/1b706b6c29771b5fcbde6499be5df905ca503d5a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Measure_view/matrixbox_quantity.xml#L110



See merge request !1448
parents 4d5d4c93 6222335b
Pipeline #16479 failed with stage
    in 0 seconds
    Expand all Hide whitespace changes
    Inline Side-by-side
    Showing with 1374 additions and 8 deletions
    bt5/erp5_ui_test/ActionTemplateItem/portal_types/Foo%20Line/view_matrixbox_tales.xml 0 → 100644
    View file @ f860e578
    <?xml version="1.0"?>
    <ZopeData>
    <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
    <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>action</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>categories</string> </key>
    <value>
    <tuple>
    <string>action_type/object_view</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>category</string> </key>
    <value> <string>object_view</string> </value>
    </item>
    <item>
    <key> <string>condition</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>description</string> </key>
    <value>
    <none/>
    </value>
    </item>
    <item>
    <key> <string>icon</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>view_matrixbox_tales</string> </value>
    </item>
    <item>
    <key> <string>permissions</string> </key>
    <value>
    <tuple>
    <string>View</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>portal_type</string> </key>
    <value> <string>Action Information</string> </value>
    </item>
    <item>
    <key> <string>priority</string> </key>
    <value> <float>4.0</float> </value>
    </item>
    <item>
    <key> <string>title</string> </key>
    <value> <string>MatrixBox TALES</string> </value>
    </item>
    <item>
    <key> <string>visible</string> </key>
    <value> <int>1</int> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
    <global name="Expression" module="Products.CMFCore.Expression"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>text</string> </key>
    <value> <string>string:${object_url}/FooLine_viewMatrixBoxTALESContext</string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    bt5/erp5_ui_test/PathTemplateItem/portal_tests/matrixbox_zuite/testEditableCellTALES.xml 0 → 100644
    View file @ f860e578
    <?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>testEditableCellTALES</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_ui_test/PathTemplateItem/portal_tests/matrixbox_zuite/testEditableCellTALES.zpt 0 → 100644
    View file @ f860e578
    <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 TALES context for editable cells</title>
    </head>
    <body>
    <table cellpadding="1" cellspacing="1" border="1">
    <thead>
    <tr><td rowspan="1" colspan="3">Test TALES context for editable cells</td></tr>
    </thead><tbody>
    <tal:block metal:use-macro="here/MatrixBoxZuite_CommonTemplate/macros/init" />
    <!-- create one cell -->
    <tr>
    <td>open</td>
    <td>${base_url}/foo_module/FooModule_createObjects?create_line:int=1</td>
    <td></td>
    </tr>
    <tr>
    <td>assertTextPresent</td>
    <td>Created Successfully.</td>
    <td></td>
    </tr>
    <tr>
    <td>open</td>
    <td>${base_url}/foo_module/Zuite_waitForActivities</td>
    <td></td>
    </tr>
    <tr>
    <td>assertTextPresent</td>
    <td>Done.</td>
    <td></td>
    </tr>
    <tr>
    <td>open</td>
    <td>${base_url}/foo_module/0/1/FooLine_viewMatrixBox</td>
    <td></td>
    </tr>
    <!-- create (only) one cell -->
    <tr>
    <td>type</td>
    <td>field_matrixbox_quantity_cell_0_0_0</td>
    <td>1.0</td>
    </tr>
    <tr>
    <td>clickAndWait</td>
    <td>Base_edit:method</td>
    <td></td>
    </tr>
    <tr>
    <td>assertPortalStatusMessage</td>
    <td>Data updated.</td>
    <td></td>
    </tr>
    <tr>
    <td>verifyValue</td>
    <td>field_matrixbox_quantity_cell_0_0_0</td>
    <td>1.0</td>
    </tr>
    <tr>
    <td>verifyValue</td>
    <td>field_matrixbox_quantity_cell_1_0_0</td>
    <td></td>
    </tr>
    <tr>
    <td>open</td>
    <td>${base_url}/foo_module/0/1/FooLine_viewMatrixBoxTALESContext</td>
    <td></td>
    </tr>
    <!-- When a cell exist at these coordinate, `cell` in TALES context is the cell. -->
    <tr>
    <td>assertValue</td>
    <td>field_matrixbox_title_cell_0_0_0</td>
    <td>cell_index: ['a', 'one'] cell_position: (0, 0, 0) cell: &lt;Foo Line at <tal:block tal:replace="context/foo_module/getPath"/>/0/1/cell_0_0&gt;</td>
    </tr>
    <!-- When no cell exist, `cell` in TALES context is None. -->
    <tr>
    <td>assertValue</td>
    <td>field_matrixbox_title_cell_1_0_0</td>
    <td>cell_index: ['b', 'one'] cell_position: (1, 0, 0) cell: None</td>
    </tr>
    </tbody>
    </table>
    </body>
    </html>
    \ No newline at end of file
    bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/FooLine_viewMatrixBox/matrixbox_quantity.xml
    View file @ f860e578
    ...@@ -154,6 +154,10 @@ ...@@ -154,6 +154,10 @@
    <key> <string>input_style</string> </key> <key> <string>input_style</string> </key>
    <value> <string></string> </value> <value> <string></string> </value>
    </item> </item>
    <item>
    <key> <string>input_type</string> </key>
    <value> <string></string> </value>
    </item>
    <item> <item>
    <key> <string>precision</string> </key> <key> <string>precision</string> </key>
    <value> <string></string> </value> <value> <string></string> </value>
    ...@@ -255,10 +259,7 @@ ...@@ -255,10 +259,7 @@
    </record> </record>
    <record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
    <pickle> <pickle>
    <tuple> <global name="TALESMethod" module="Products.Formulator.TALESField"/>
    <global name="TALESMethod" module="Products.Formulator.TALESField"/>
    <tuple/>
    </tuple>
    </pickle> </pickle>
    <pickle> <pickle>
    <dictionary> <dictionary>
    ......
    bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/FooLine_viewMatrixBoxTALESContext.xml 0 → 100644
    View file @ f860e578
    <?xml version="1.0"?>
    <ZopeData>
    <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
    <global name="ERP5 Form" module="erp5.portal_type"/>
    </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/>
    </value>
    </item>
    </dictionary>
    </state>
    </object>
    </value>
    </item>
    <item>
    <key> <string>_objects</string> </key>
    <value>
    <tuple/>
    </value>
    </item>
    <item>
    <key> <string>action</string> </key>
    <value> <string>Base_edit</string> </value>
    </item>
    <item>
    <key> <string>description</string> </key>
    <value> <string>Display a matrix box for selenium tests</string> </value>
    </item>
    <item>
    <key> <string>edit_order</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>encoding</string> </key>
    <value> <string>UTF-8</string> </value>
    </item>
    <item>
    <key> <string>enctype</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>group_list</string> </key>
    <value>
    <list>
    <string>left</string>
    <string>right</string>
    <string>center</string>
    <string>bottom</string>
    <string>hidden</string>
    </list>
    </value>
    </item>
    <item>
    <key> <string>groups</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>bottom</string> </key>
    <value>
    <list>
    <string>matrixbox</string>
    </list>
    </value>
    </item>
    <item>
    <key> <string>center</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>hidden</string> </key>
    <value>
    <list>
    <string>matrixbox_title</string>
    </list>
    </value>
    </item>
    <item>
    <key> <string>left</string> </key>
    <value>
    <list>
    <string>my_title</string>
    </list>
    </value>
    </item>
    <item>
    <key> <string>right</string> </key>
    <value>
    <list/>
    </value>
    </item>
    </dictionary>
    </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>FooLine_viewMatrixBoxTALESContext</string> </value>
    </item>
    <item>
    <key> <string>method</string> </key>
    <value> <string>POST</string> </value>
    </item>
    <item>
    <key> <string>name</string> </key>
    <value> <string>Foo_view</string> </value>
    </item>
    <item>
    <key> <string>pt</string> </key>
    <value> <string>form_view</string> </value>
    </item>
    <item>
    <key> <string>row_length</string> </key>
    <value> <int>4</int> </value>
    </item>
    <item>
    <key> <string>stored_encoding</string> </key>
    <value> <string>UTF-8</string> </value>
    </item>
    <item>
    <key> <string>title</string> </key>
    <value> <string>Foo Line</string> </value>
    </item>
    <item>
    <key> <string>unicode_mode</string> </key>
    <value> <int>0</int> </value>
    </item>
    <item>
    <key> <string>update_action</string> </key>
    <value> <string></string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    bt5/erp5_ui_test/bt/template_action_path_list
    View file @ f860e578
    ...@@ -13,6 +13,7 @@ Foo Line | view ...@@ -13,6 +13,7 @@ Foo Line | view
    Foo Line | view_contentlist Foo Line | view_contentlist
    Foo Line | view_dynamic_matrixbox Foo Line | view_dynamic_matrixbox
    Foo Line | view_matrixbox Foo Line | view_matrixbox
    Foo Line | view_matrixbox_tales
    Foo Module | do_nothing_action_jio Foo Module | do_nothing_action_jio
    Foo Module | do_nothing_report_jio Foo Module | do_nothing_report_jio
    Foo Module | empty_mass_action Foo Module | empty_mass_action
    ......
    bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_matrixbox_zuite/testEditableCellTALES.xml 0 → 100644
    View file @ f860e578
    <?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>testEditableCellTALES</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_matrixbox_zuite/testEditableCellTALES.zpt 0 → 100644
    View file @ f860e578
    <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 TALES context for editable cells</title>
    </head>
    <body>
    <table cellpadding="1" cellspacing="1" border="1">
    <thead>
    <tr><td rowspan="1" colspan="3">Test TALES context for editable cells</td></tr>
    </thead><tbody>
    <tal:block metal:use-macro="here/MatrixBoxZuite_CommonTemplate/macros/init" />
    <tr><td>store</td>
    <td>${base_url}/web_site_module/renderjs_runner</td>
    <td>renderjs_url</td></tr>
    <tr><td>open</td>
    <td>${base_url}/foo_module/FooModule_createObjects?create_line:int=1</td><td></td></tr>
    <tr><td>assertTextPresent</td>
    <td>Created Successfully.</td><td></td></tr>
    <tr><td>open</td>
    <td>${base_url}/foo_module/Zuite_waitForActivities</td><td></td></tr>
    <tr><td>assertTextPresent</td>
    <td>Done.</td><td></td></tr>
    <tr><td>open</td>
    <td>${renderjs_url}/#/foo_module/0/1?editable=1</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': 'Views'}">
    <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 tal:define="click_configuration python: {'text': 'MatrixBox'}">
    <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/click_on_page_link" />
    </tal:block>
    <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" />
    <tr><td>type</td>
    <td>field_matrixbox_quantity_cell_0_0_0</td>
    <td>1.0</td></tr>
    <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/save" />
    <tal:block tal:define="click_configuration python: {'text': 'Views'}">
    <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 tal:define="click_configuration python: {'text': 'MatrixBox TALES'}">
    <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/click_on_page_link" />
    </tal:block>
    <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" />
    <!-- When a cell exist at these coordinate, `cell` in TALES context is the cell. -->
    <tr>
    <td>assertValue</td>
    <td>field_matrixbox_title_cell_0_0_0</td>
    <td>cell_index: ['a', 'one'] cell_position: (0, 0, 0) cell: &lt;Foo Line at <tal:block tal:replace="context/foo_module/getPath"/>/0/1/cell_0_0&gt;</td>
    </tr>
    <!-- When no cell exist, `cell` in TALES context is None. -->
    <tr>
    <td>assertValue</td>
    <td>field_matrixbox_title_cell_1_0_0</td>
    <td>cell_index: ['b', 'one'] cell_position: (1, 0, 0) cell: None</td>
    </tr>
    </tbody>
    </table>
    </body>
    </html>
    \ No newline at end of file
    product/ERP5Form/Form.py
    View file @ f860e578
    ...@@ -213,10 +213,7 @@ class TALESValue(StaticValue): ...@@ -213,10 +213,7 @@ class TALESValue(StaticValue):
    if kw.get('cell') is None: if kw.get('cell') is None:
    request = kw.get('REQUEST') request = kw.get('REQUEST')
    if request is not None: if request is not None:
    if getattr(request, 'cell', None) is not None: kw['cell'] = getattr(request, 'cell', None)
    kw['cell'] = request.cell
    else:
    kw['cell'] = request
    if 'cell_index' not in kw and\ if 'cell_index' not in kw and\
    getattr(request, 'cell_index', None) is not None: getattr(request, 'cell_index', None) is not None:
    kw['cell_index'] = request.cell_index kw['cell_index'] = request.cell_index
    ......
    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