Skip to content

erp5
erp5
Commit d4cde62e authored by Romain Courteaud's avatar Romain Courteaud
Browse files
Options

[erp5_web_renderjs_ui] Propagate the existing cancel_url when displaying a dialog 

Test cancelling a dialog displayed twice.
Test submitting a dialog displayed twice.
parent 6cb42562
Pipeline #6650 failed with stage
    in 0 seconds
    Show whitespace changes
    Inline Side-by-side
    Showing with 423 additions and 106 deletions
    bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.js
    View file @ d4cde62e
    ......@@ -508,6 +508,10 @@
    next_options.selection_index = previous_options.selection_index;
    copyStickyParameterDict(previous_options, next_options);
    if (create_cancel_url) {
    if (previous_options.hasOwnProperty('cancel')) {
    // Propagate existing cancel url when going from one dialog to another
    next_options.cancel = previous_options.cancel;
    } else {
    // Keep cancel parameters as small as possible to prevent huge url
    previous_options = dropStickyParameterEntry(previous_options);
    delete previous_options.selection;
    ......@@ -515,6 +519,7 @@
    delete previous_options.selection_index;
    next_options.cancel = JSON.stringify(previous_options);
    }
    }
    return execDisplayCommand(gadget, next_options);
    }
    ......
    bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.xml
    View file @ d4cde62e
    ......@@ -150,11 +150,13 @@
    </record>
    <record id="3" aka="AAAAAAAAAAM=">
    <pickle>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
    </pickle>
    <pickle>
    <tuple>
    <none/>
    <dictionary>
    <item>
    <key> <string>_log</string> </key>
    <value>
    <list>
    <dictionary>
    <item>
    ......@@ -198,16 +200,20 @@
    </item>
    </dictionary>
    </list>
    </tuple>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    <record id="4" aka="AAAAAAAAAAQ=">
    <pickle>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
    </pickle>
    <pickle>
    <tuple>
    <none/>
    <dictionary>
    <item>
    <key> <string>_log</string> </key>
    <value>
    <list>
    <dictionary>
    <item>
    ......@@ -230,7 +236,7 @@
    </item>
    <item>
    <key> <string>serial</string> </key>
    <value> <string>976.13992.3039.61525</string> </value>
    <value> <string>979.51895.64958.60108</string> </value>
    </item>
    <item>
    <key> <string>state</string> </key>
    ......@@ -248,7 +254,7 @@
    </tuple>
    <state>
    <tuple>
    <float>1559827800.58</float>
    <float>1573725627.05</float>
    <string>UTC</string>
    </tuple>
    </state>
    ......@@ -257,7 +263,9 @@
    </item>
    </dictionary>
    </list>
    </tuple>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormDialogDisplayedTwiceProceedAction.xml 0 → 100644
    View file @ d4cde62e
    <?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>testFormDialogDisplayedTwiceProceedAction</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_page_templates_zuite/testFormDialogDisplayedTwiceProceedAction.zpt 0 → 100644
    View file @ d4cde62e
    <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 Command Display With History</title>
    </head>
    <body>
    <table cellpadding="1" cellspacing="1" border="1">
    <thead>
    <tr><td rowspan="1" colspan="3">Test Command Display With History</td></tr>
    </thead><tbody>
    <tal:block metal:use-macro="here/PTZuite_CommonTemplate/macros/init" />
    <tr>
    <td>open</td>
    <td>${base_url}/web_site_module/renderjs_runner/#/foo_module/1</td>
    <td></td>
    </tr>
    <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_app_loaded" />
    <!-- Wait for gadget to be loaded -->
    <tr>
    <td>assertElementPresent</td>
    <td>//div[@data-gadget-url='${base_url}/web_site_module/renderjs_runner/gadget_erp5_pt_form_view.html']</td>
    <td></td>
    </tr>
    <tr>
    <td>assertTextNotPresent</td>
    <td>Duration Quantity</td>
    <td></td>
    </tr>
    <!-- Go to a non default view -->
    <tr>
    <td>assertElementPresent</td>
    <td>//div[@data-gadget-scope='panel']//a[text()='Duration Field' and contains(@href, '#!display_with_history')]</td>
    <td></td>
    </tr>
    <tal:block tal:define="click_configuration python: {'text': 'Duration 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" />
    <tr>
    <td>assertTextPresent</td>
    <td>Duration Quantity</td>
    <td></td>
    </tr>
    <!-- Trigger the dialog display on the panel link a first time. No cancel url present yet -->
    <tr>
    <td>assertElementPresent</td>
    <td>//div[@data-gadget-scope='panel']//a[text()='Validate Action' and contains(@href, '#!display_dialog_with_history') and not(contains(@href, 'p.cancel='))]</td>
    <td></td>
    </tr>
    <tal:block tal:define="click_configuration python: {'text': 'Validate Action'}">
    <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" />
    <!-- Trigger the dialog display on the panel link a second time. A existing cancel url exists -->
    <tr>
    <td>assertElementPresent</td>
    <td>//div[@data-gadget-scope='panel']//a[text()='Validate Action' and contains(@href, '#!display_dialog_with_history') and contains(@href, 'p.cancel=')]</td>
    <td></td>
    </tr>
    <tal:block tal:define="click_configuration python: {'text': 'Validate Action'}">
    <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" />
    <!-- Cancel the dialog. Ensure its goes to the Duration view -->
    <tr>
    <td>assertTextNotPresent</td>
    <td>Duration Quantity</td>
    <td></td>
    </tr>
    <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/submit_dialog" />
    <tal:block tal:define="notification_configuration python: {'class': 'success',
    'text': 'Status changed.'}">
    <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" />
    <tr>
    <td>assertTextPresent</td>
    <td>Duration Quantity</td>
    <td></td>
    </tr>
    </tbody></table>
    </body>
    </html>
    \ No newline at end of file
    bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_router_zuite/testCommandCancelDialogWithHistoryClickedTwice.xml 0 → 100644
    View file @ d4cde62e
    <?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>testCommandCancelDialogWithHistoryClickedTwice</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_router_zuite/testCommandCancelDialogWithHistoryClickedTwice.zpt 0 → 100644
    View file @ d4cde62e
    <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 Command Display With History</title>
    </head>
    <body>
    <table cellpadding="1" cellspacing="1" border="1">
    <thead>
    <tr><td rowspan="1" colspan="3">Test Command Display With History</td></tr>
    </thead><tbody>
    <tal:block metal:use-macro="here/PTZuite_CommonTemplate/macros/init" />
    <tr>
    <td>open</td>
    <td>${base_url}/web_site_module/renderjs_runner/#/foo_module/1</td>
    <td></td>
    </tr>
    <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_app_loaded" />
    <!-- Wait for gadget to be loaded -->
    <tr>
    <td>assertElementPresent</td>
    <td>//div[@data-gadget-url='${base_url}/web_site_module/renderjs_runner/gadget_erp5_pt_form_view.html']</td>
    <td></td>
    </tr>
    <tr>
    <td>assertTextNotPresent</td>
    <td>Duration Quantity</td>
    <td></td>
    </tr>
    <!-- Go to a non default view -->
    <tr>
    <td>assertElementPresent</td>
    <td>//div[@data-gadget-scope='panel']//a[text()='Duration Field' and contains(@href, '#!display_with_history')]</td>
    <td></td>
    </tr>
    <tal:block tal:define="click_configuration python: {'text': 'Duration 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" />
    <tr>
    <td>assertTextPresent</td>
    <td>Duration Quantity</td>
    <td></td>
    </tr>
    <!-- Trigger the dialog display on the panel link a first time. No cancel url present yet -->
    <tr>
    <td>assertElementPresent</td>
    <td>//div[@data-gadget-scope='panel']//a[text()='Validate Action' and contains(@href, '#!display_dialog_with_history') and not(contains(@href, 'p.cancel='))]</td>
    <td></td>
    </tr>
    <tal:block tal:define="click_configuration python: {'text': 'Validate Action'}">
    <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" />
    <!-- Trigger the dialog display on the panel link a second time. A existing cancel url exists -->
    <tr>
    <td>assertElementPresent</td>
    <td>//div[@data-gadget-scope='panel']//a[text()='Validate Action' and contains(@href, '#!display_dialog_with_history') and contains(@href, 'p.cancel=')]</td>
    <td></td>
    </tr>
    <tal:block tal:define="click_configuration python: {'text': 'Validate Action'}">
    <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" />
    <!-- Cancel the dialog. Ensure its goes to the Duration view -->
    <tr>
    <td>assertTextNotPresent</td>
    <td>Duration Quantity</td>
    <td></td>
    </tr>
    <tr>
    <td>assertElementPresent</td>
    <td>//div[@data-gadget-scope='header']//a[text()='Foo: Title 1' and contains(@href, '#!cancel_dialog_with_history') and contains(@href, 'p.cancel=')]</td>
    <td></td>
    </tr>
    <tal:block tal:define="click_configuration python: {'text': 'Foo: Title 1'}">
    <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" />
    <tr>
    <td>assertTextPresent</td>
    <td>Duration Quantity</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