Skip to content

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

ERP5JS: render before commit 

Since 264ded5c in ERP5JS we render the form directly after a successful edit, but this was done sometimes too early, namely, the next form was rendered before interaction workflows and this leads to problems like the ones discussed in nexedi/erp5!982 (comment 92893)

/reviewed-on nexedi/erp5!1040
parents ed44bee5 97c40dcb
Pipeline #7855 failed with stage
    in 0 seconds
    Show whitespace changes
    Inline Side-by-side
    Showing with 624 additions and 8 deletions
    bt5/erp5_hal_json_style/ExtensionTemplateItem/portal_components/extension.erp5.HalStyle.py
    View file @ dc02bfa8
    ...@@ -2,7 +2,7 @@ from Acquisition import aq_self, aq_base, aq_inner ...@@ -2,7 +2,7 @@ from Acquisition import aq_self, aq_base, aq_inner
    from Products.ERP5Type.Utils import UpperCase from Products.ERP5Type.Utils import UpperCase
    from ZODB.POSException import ConflictError from ZODB.POSException import ConflictError
    from AccessControl import Unauthorized from AccessControl import Unauthorized
    import transaction
    def Base_aqSelf(self): def Base_aqSelf(self):
    return aq_self(self) return aq_self(self)
    ...@@ -103,3 +103,16 @@ def WorkflowTool_listActionParameterList(self): ...@@ -103,3 +103,16 @@ def WorkflowTool_listActionParameterList(self):
    return result_list return result_list
    def Base_renderFormAtEndOfTransaction(self, request, response, form_id, **kw):
    def renderFormAndSetResponseBody(context, request, response, form_id, **kw):
    kw['message'] = request.get('portal_status_message') or kw['message']
    response.setBody(context.Base_renderForm(form_id, **kw))
    transaction.get().addBeforeCommitHook(
    renderFormAndSetResponseBody, (
    self,
    request,
    response,
    form_id,), kw)
    \ No newline at end of file
    bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/Base_edit.py
    View file @ dc02bfa8
    ...@@ -254,9 +254,11 @@ if context.REQUEST.get('is_web_mode', False) and \ ...@@ -254,9 +254,11 @@ if context.REQUEST.get('is_web_mode', False) and \
    not editable_mode: not editable_mode:
    form_id = 'view' form_id = 'view'
    # Directly render the form after a successful edit # Directly render the form after a successful edit, but in a before commit
    # hook, so that if interactions modify the state we render the new state.
    # Cleanup formulator's special key in request to ensure field are only calculated from context and not the request anymore # Cleanup formulator's special key in request to ensure field are only calculated from context and not the request anymore
    for key in list(context.REQUEST.keys()): for key in list(context.REQUEST.keys()):
    if str(key).startswith('field') or str(key).startswith('subfield'): if str(key).startswith('field') or str(key).startswith('subfield'):
    context.REQUEST.form.pop(key, None) context.REQUEST.form.pop(key, None)
    return context.Base_renderForm(form_id, message=message) return context.Base_renderFormAtEndOfTransaction(request, request.response, form_id, message=message)
    bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/Base_renderFormAtEndOfTransaction.xml 0 → 100644
    View file @ dc02bfa8
    <?xml version="1.0"?>
    <ZopeData>
    <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
    <global name="ExternalMethod" module="Products.ExternalMethod.ExternalMethod"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>_function</string> </key>
    <value> <string>Base_renderFormAtEndOfTransaction</string> </value>
    </item>
    <item>
    <key> <string>_module</string> </key>
    <value> <string>HalStyle</string> </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>Base_renderFormAtEndOfTransaction</string> </value>
    </item>
    <item>
    <key> <string>title</string> </key>
    <value> <string></string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testEditWithBeforeCommitInteractionWorkflow.xml 0 → 100644
    View file @ dc02bfa8
    <?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>testEditWithBeforeCommitInteractionWorkflow</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/document_zuite/testEditWithBeforeCommitInteractionWorkflow.zpt 0 → 100644
    View file @ dc02bfa8
    <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 Edit with "Before Commit" interaction worklow</title>
    </head>
    <body>
    <table cellpadding="1" cellspacing="1" border="1">
    <thead>
    <tr><td rowspan="1" colspan="3">Test Edit with "Before Commit" interaction worklow</td></tr>
    </thead><tbody>
    <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/init" />
    <tr>
    <td>open</td>
    <td>${base_url}/foo_module/FooModule_createObjects?num: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</td>
    <td></td>
    </tr>
    <tr>
    <td>type</td>
    <td>field_my_title</td>
    <td>before commit</td>
    </tr>
    <tr>
    <td>clickAndWait</td>
    <td>Base_edit:method</td>
    <td></td>
    </tr>
    <tr>
    <td>assertValue</td>
    <td>field_my_title</td>
    <td>before commit</td>
    </tr>
    <tr>
    <td>assertValue</td>
    <td>field_my_short_title</td>
    <td>set by interaction workflow</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>
    </tbody></table>
    </body>
    </html>
    \ No newline at end of file
    bt5/erp5_ui_test/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
    View file @ dc02bfa8
    <workflow_chain> <workflow_chain>
    <chain> <chain>
    <type>Bar</type> <type>Bar</type>
    <workflow>edit_workflow, foo_workflow, bar_validation_workflow</workflow> <workflow>bar_validation_workflow, edit_workflow, foo_workflow</workflow>
    </chain> </chain>
    <chain> <chain>
    <type>Foo</type> <type>Foo</type>
    <workflow>edit_workflow, foo_workflow, foo_validation_workflow</workflow> <workflow>edit_workflow, foo_interaction_workflow, foo_validation_workflow, foo_workflow</workflow>
    </chain> </chain>
    <chain> <chain>
    <type>Foo Line</type> <type>Foo Line</type>
    ......
    bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_interaction_workflow.xml 0 → 100644
    View file @ dc02bfa8
    <?xml version="1.0"?>
    <ZopeData>
    <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
    <global name="InteractionWorkflowDefinition" module="Products.ERP5.InteractionWorkflow"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>_objects</string> </key>
    <value>
    <tuple/>
    </value>
    </item>
    <item>
    <key> <string>groups</string> </key>
    <value>
    <tuple/>
    </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>foo_interaction_workflow</string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_interaction_workflow/interactions.xml 0 → 100644
    View file @ dc02bfa8
    <?xml version="1.0"?>
    <ZopeData>
    <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
    <global name="Interaction" module="Products.ERP5.Interaction"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>_mapping</string> </key>
    <value>
    <dictionary/>
    </value>
    </item>
    <item>
    <key> <string>_objects</string> </key>
    <value>
    <tuple/>
    </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>interactions</string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_interaction_workflow/interactions/setTitle.xml 0 → 100644
    View file @ dc02bfa8
    <?xml version="1.0"?>
    <ZopeData>
    <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
    <global name="InteractionDefinition" module="Products.ERP5.Interaction"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>actbox_category</string> </key>
    <value> <string>workflow</string> </value>
    </item>
    <item>
    <key> <string>actbox_name</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>actbox_url</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>activate_script_name</string> </key>
    <value>
    <tuple/>
    </value>
    </item>
    <item>
    <key> <string>after_script_name</string> </key>
    <value>
    <tuple/>
    </value>
    </item>
    <item>
    <key> <string>before_commit_script_name</string> </key>
    <value>
    <list>
    <string>Foo_setTitle</string>
    </list>
    </value>
    </item>
    <item>
    <key> <string>description</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>guard</string> </key>
    <value>
    <none/>
    </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>setTitle</string> </value>
    </item>
    <item>
    <key> <string>method_id</string> </key>
    <value>
    <list>
    <string>_setTitle</string>
    </list>
    </value>
    </item>
    <item>
    <key> <string>once_per_transaction</string> </key>
    <value> <int>1</int> </value>
    </item>
    <item>
    <key> <string>portal_type_filter</string> </key>
    <value>
    <none/>
    </value>
    </item>
    <item>
    <key> <string>portal_type_group_filter</string> </key>
    <value>
    <none/>
    </value>
    </item>
    <item>
    <key> <string>script_name</string> </key>
    <value>
    <tuple/>
    </value>
    </item>
    <item>
    <key> <string>temporary_document_disallowed</string> </key>
    <value> <int>0</int> </value>
    </item>
    <item>
    <key> <string>title</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>trigger_type</string> </key>
    <value> <int>2</int> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_interaction_workflow/scripts.xml 0 → 100644
    View file @ dc02bfa8
    <?xml version="1.0"?>
    <ZopeData>
    <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
    <global name="Scripts" module="Products.DCWorkflow.Scripts"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>_mapping</string> </key>
    <value>
    <dictionary/>
    </value>
    </item>
    <item>
    <key> <string>_objects</string> </key>
    <value>
    <tuple/>
    </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>scripts</string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_interaction_workflow/scripts/Foo_setTitle.py 0 → 100644
    View file @ dc02bfa8
    foo = sci['object']
    if sci['kwargs']['workflow_method_args'] == ('before commit',):
    foo.setShortTitle("set by interaction workflow")
    bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_interaction_workflow/scripts/Foo_setTitle.xml 0 → 100644
    View file @ dc02bfa8
    <?xml version="1.0"?>
    <ZopeData>
    <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
    <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>Script_magic</string> </key>
    <value> <int>3</int> </value>
    </item>
    <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_container</string> </key>
    <value> <string>container</string> </value>
    </item>
    <item>
    <key> <string>name_context</string> </key>
    <value> <string>context</string> </value>
    </item>
    <item>
    <key> <string>name_m_self</string> </key>
    <value> <string>script</string> </value>
    </item>
    <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>_params</string> </key>
    <value> <string>sci</string> </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>Foo_setTitle</string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_interaction_workflow/variables.xml 0 → 100644
    View file @ dc02bfa8
    <?xml version="1.0"?>
    <ZopeData>
    <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
    <global name="Variables" module="Products.DCWorkflow.Variables"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>_mapping</string> </key>
    <value>
    <dictionary/>
    </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>variables</string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_interaction_workflow/worklists.xml 0 → 100644
    View file @ dc02bfa8
    <?xml version="1.0"?>
    <ZopeData>
    <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
    <global name="Worklists" module="Products.DCWorkflow.Worklists"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>_mapping</string> </key>
    <value>
    <dictionary/>
    </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>worklists</string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    bt5/erp5_ui_test/bt/template_action_path_list
    View file @ dc02bfa8
    ...@@ -26,6 +26,7 @@ Foo | dummy_multicheckboxfield_report ...@@ -26,6 +26,7 @@ Foo | dummy_multicheckboxfield_report
    Foo | dummy_multilistfield_report Foo | dummy_multilistfield_report
    Foo | dummy_radiofield_report Foo | dummy_radiofield_report
    Foo | dummy_report Foo | dummy_report
    Foo | fail_dialog_action_jio
    Foo | list Foo | list
    Foo | python_action_jio Foo | python_action_jio
    Foo | python_error_action_jio Foo | python_error_action_jio
    ......
    bt5/erp5_ui_test/bt/template_portal_type_workflow_chain_list
    View file @ dc02bfa8
    Bar | bar_validation_workflow
    Bar | edit_workflow Bar | edit_workflow
    Bar | foo_workflow Bar | foo_workflow
    Bar | bar_validation_workflow
    Foo Line | pricing_interaction_workflow Foo Line | pricing_interaction_workflow
    Foo | edit_workflow Foo | edit_workflow
    Foo | foo_workflow Foo | foo_interaction_workflow
    Foo | foo_validation_workflow Foo | foo_validation_workflow
    Foo | foo_workflow
    \ No newline at end of file
    bt5/erp5_ui_test/bt/template_workflow_id_list
    View file @ dc02bfa8
    bar_validation_workflow bar_validation_workflow
    foo_workflow foo_interaction_workflow
    foo_validation_workflow foo_validation_workflow
    foo_workflow
    \ No newline at end of file
    bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_zuite/testEditWithBeforeCommitInteractionWorkflow.xml 0 → 100644
    View file @ dc02bfa8
    <?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>testEditWithBeforeCommitInteractionWorkflow</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_zuite/testEditWithBeforeCommitInteractionWorkflow.zpt 0 → 100644
    View file @ dc02bfa8
    <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 Edit with "Before Commit" interaction worklow</title>
    </head>
    <body>
    <table cellpadding="1" cellspacing="1" border="1">
    <thead>
    <tr><td rowspan="1" colspan="3">Test Edit with "Before Commit" interaction worklow</td></tr>
    </thead><tbody>
    <tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/init" />
    <!-- Clean Up -->
    <tr>
    <td>open</td>
    <td>${base_url}/bar_module/ListBoxZuite_reset</td>
    <td></td>
    </tr>
    <tr>
    <td>assertTextPresent</td>
    <td>Reset Successfully.</td>
    <td></td>
    </tr>
    <!-- Initialize -->
    <tr>
    <td>open</td>
    <td>${base_url}/web_site_module/renderjs_runner/#/foo_module</td>
    <td></td>
    </tr>
    <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_app_loaded" />
    <!--create one doc -->
    <tal:block tal:define="click_configuration python: {'text': 'Add'}">
    <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" />
    <!-- edit "title" field, this should automatically set "short title" -->
    <tr>
    <td>waitForElementPresent</td>
    <td>//input[@name="field_my_title"]</td>
    <td></td>
    </tr>
    <tr>
    <td>type</td>
    <td>//input[@name="field_my_title"]</td>
    <td>before commit</td>
    </tr>
    <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/save" />
    <tr>
    <td>waitForElementPresent</td>
    <td>//input[@name="field_my_title"]</td>
    <td></td>
    </tr>
    <tr>
    <td>assertValue</td>
    <td>//input[@name="field_my_title"]</td>
    <td>before commit</td>
    </tr>
    <tr>
    <td>assertValue</td>
    <td>//input[@name="field_my_short_title"]</td>
    <td>set by interaction workflow</td>
    </tr>
    <tr>
    <td>open</td>
    <td>${base_url}/bar_module/Zuite_waitForActivities</td>
    <td></td>
    </tr>
    <tr>
    <td>assertTextPresent</td>
    <td>Done.</td>
    <td></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