diff --git a/bt5/erp5_ui_test/ActionTemplateItem/portal_types/Foo%20Module/do_nothing_action_jio.xml b/bt5/erp5_ui_test/ActionTemplateItem/portal_types/Foo%20Module/do_nothing_action_jio.xml new file mode 100644 index 0000000000000000000000000000000000000000..c25888f2610e532f03e202ee4f63d7c5d733b60b --- /dev/null +++ b/bt5/erp5_ui_test/ActionTemplateItem/portal_types/Foo%20Module/do_nothing_action_jio.xml @@ -0,0 +1,85 @@ + + + + + + + + + + action + + AAAAAAAAAAI= + + + + categories + + + action_type/object_jio_action + + + + + category + object_jio_action + + + condition + + + + description + + + + + + icon + + + + id + do_nothing_action_jio + + + permissions + + + View + + + + + portal_type + Action Information + + + priority + 1.0 + + + title + Do Nothing Action + + + visible + 1 + + + + + + + + + + + + text + string:${object_url}/Foo_viewDoNothingActionDialog + + + + + diff --git a/bt5/erp5_ui_test/bt/template_action_path_list b/bt5/erp5_ui_test/bt/template_action_path_list index cfa88ddf593581fbd3368165be3752d27ae735ef..6acf46a7ce68980380d4a64599dc44909c2ee4b0 100644 --- a/bt5/erp5_ui_test/bt/template_action_path_list +++ b/bt5/erp5_ui_test/bt/template_action_path_list @@ -9,6 +9,7 @@ Foo Line | view Foo Line | view_contentlist Foo Line | view_dynamic_matrixbox Foo Line | view_matrixbox +Foo Module | do_nothing_action_jio Foo Module | do_nothing_report_jio Foo Module | empty_mass_action Foo Module | list diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_form_html.html b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_form_html.html index d0efc578224ab471d03ebb2d58727cbba96608ab..7cd067608aaea2633e4e26a03773dfa681ea339f 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_form_html.html +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_form_html.html @@ -6,6 +6,7 @@ data-i18n=You do not have the permissions to edit the object. data-i18n=You are offline. data-i18n=Action succeeded. data-i18n=Data received. +data-i18n=List --> diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_form_html.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_form_html.xml index 048eb7c3ab928814493a3adef91a53d5658a716d..968d91f59c8d09855a55b4047e20942a31947ee9 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_form_html.xml +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_form_html.xml @@ -232,7 +232,7 @@ serial - 973.40657.63647.56780 + 974.59811.2178.43622 state @@ -250,7 +250,7 @@ - 1554191060.89 + 1556802379.3 UTC diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_form_js.js b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_form_js.js index 3de7a057e48674442a9df37cac27e0c0fb6cf9bb..2ab3e735e81f22f99c8037305b84d23d93986c0f 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_form_js.js +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_form_js.js @@ -49,6 +49,8 @@ and handling data send&receive. 'gadget_html5_textarea.html', 'gadget_html5_select.html' ], + erp5_module_regexp = /^[^\/]+_module$/, + erp5_portal_document_regexp = /^portal_.*\/.+$/, erp5_module_document_regexp = /^[^\/]+_module\/.+$/; /*jslint regexp: false*/ @@ -114,6 +116,7 @@ and handling data send&receive. .declareAcquiredMethod("notifyChange", "notifyChange") .declareAcquiredMethod("notifySubmitting", "notifySubmitting") .declareAcquiredMethod("notifySubmitted", "notifySubmitted") + .declareAcquiredMethod("getTranslationList", "getTranslationList") ///////////////////////////////////////////////////////////////// // Proxy methods to the child gadget @@ -268,6 +271,9 @@ and handling data send&receive. gadget = this, options = gadget.state.options, page_template_gadget, + is_module = erp5_module_regexp.test(gadget.state.options.jio_key), + is_module_document = erp5_module_document_regexp.test(gadget.state.options.jio_key), + is_portal_document = erp5_portal_document_regexp.test(gadget.state.options.jio_key), erp5_document = JSON.parse(gadget.state.erp5_document), erp5_form = JSON.parse(gadget.state.erp5_form); @@ -307,17 +313,29 @@ and handling data send&receive. } }) .push(function () { - var jio_key = gadget.state.options.jio_key; - /*jslint regexp: true*/ - if ((erp5_module_document_regexp.test(jio_key)) || (/^portal_.*\/.+$/.test(jio_key))) { - /*jslint regexp: false*/ - return gadget.updatePanel({ - erp5_document: erp5_document, - editable: gadget.state.options.editable, - jio_key: jio_key, - view: options.view - }); + if (is_module) { + return gadget.getTranslationList(["List"]); } + }) + .push(function (translation_list) { + var display_workflow_list = true; + if (is_module) { + if (erp5_document._links) { + // hardcode "VIEWS: List" to hide "consistency", "history" and "metadata" + erp5_document._links.action_object_view = + [{"name": "view", "title": translation_list[0], "href": "view", "icon": null}]; + display_workflow_list = false; + } + } else if (!(is_module_document || is_portal_document)) { + return; + } + return gadget.updatePanel({ + display_workflow_list: display_workflow_list, + erp5_document: erp5_document, + editable: gadget.state.options.editable, + jio_key: gadget.state.options.jio_key, + view: options.view + }); }); }) /** SubmitContent should be called by the gadget which renders submit button diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_form_js.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_form_js.xml index fe78d289eae8abf0ebfaf7418fafd463b35e802d..d8b49a97cc02a3f5ec0edc089e30629eae361dce 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_form_js.xml +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_form_js.xml @@ -228,7 +228,7 @@ serial - 972.50141.1687.13277 + 975.56533.48127.29525 state @@ -246,7 +246,7 @@ - 1546616402.84 + 1558448080.86 UTC diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_js.js b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_js.js index c26e3d387cd05246ce0aa6df7dec6910bfbc1db3..7ed017f6bf3dbf1f9454e53969cfc80cfc095649 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_js.js +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_js.js @@ -61,6 +61,7 @@ jio_key = options.jio_key, view = options.view, visible = options.visible, + display_workflow_list, context = this, workflow_list, view_list, @@ -70,6 +71,13 @@ if (visible === undefined) { visible = context.state.visible; } + + if (options.display_workflow_list === undefined) { + display_workflow_list = true; + } else { + display_workflow_list = asBoolean(options.display_workflow_list); + } + if ((erp5_document !== undefined) && (jio_key !== undefined)) { workflow_list = ensureArray(erp5_document._links.action_workflow); view_list = ensureArray(erp5_document._links.action_object_view); @@ -102,6 +110,7 @@ .push(function (editable) { return context.changeState({ visible: visible, + display_workflow_list: display_workflow_list, workflow_list: workflow_list, view_list: view_list, action_list: action_list, @@ -115,6 +124,7 @@ .onStateChange(function onStateChange(modification_dict) { var context = this, gadget = this, + workflow_list, queue = new RSVP.Queue(); if (modification_dict.hasOwnProperty("visible")) { @@ -233,9 +243,9 @@ .push(function () { var i = 0, parameter_list = [], - workflow_list = JSON.parse(gadget.state.workflow_list), view_list = JSON.parse(gadget.state.view_list), action_list = JSON.parse(gadget.state.action_list); + workflow_list = JSON.parse(gadget.state.workflow_list); for (i = 0; i < view_list.length; i += 1) { parameter_list.push({ @@ -272,14 +282,16 @@ .push(function (result_list) { var dl_element, dl_fragment = document.createDocumentFragment(), - workflow_list = JSON.parse(gadget.state.workflow_list), view_list = JSON.parse(gadget.state.view_list), action_list = JSON.parse(gadget.state.action_list); appendDt(dl_fragment, result_list[1][0], 'eye', view_list, result_list[0], 0); - appendDt(dl_fragment, result_list[1][1], 'random', - workflow_list, result_list[0], view_list.length); + if (gadget.state.display_workflow_list) { + // show Workflows only on document + appendDt(dl_fragment, result_list[1][1], 'random', + workflow_list, result_list[0], view_list.length); + } appendDt(dl_fragment, result_list[1][2], 'cogs', action_list, result_list[0], view_list.length + workflow_list.length); diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_js.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_js.xml index 3f31d9d52d7a7de16a656598095d539b6d4f7715..24bbb20243482da38871475bfca8cc3668704535 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_js.xml +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_js.xml @@ -228,7 +228,7 @@ serial - 972.50145.12391.26965 + 975.56491.25907.38877 state @@ -246,7 +246,7 @@ - 1546958744.66 + 1558448423.72 UTC diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormDialogMenuAction.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormDialogMenuAction.zpt index b1411dfab6b46e7ca44f4d2b5a7c4dbd9df9ef58..9a7df43f93a94ed675739bc59f233302a70592b9 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormDialogMenuAction.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormDialogMenuAction.zpt @@ -37,26 +37,7 @@ - - assertElementPresent - //div[@data-gadget-scope='header']//button[text()='Menu' and @type='submit'] - - - - assertElementNotPresent - //div[@data-gadget-scope='panel' and contains(@class, 'visible')] - - - - click - //div[@data-gadget-scope='header']//button[text()='Menu' and @type='submit'] - - - - waitForElementPresent - //div[@data-gadget-scope='panel' and contains(@class, 'visible')] - - + diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormListMenuAction.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormListMenuAction.zpt index d7590f09b17e631160e7ab8d661886c6f3ae274b..df883b72944f7994bf8cff460eadc8c4a8480f16 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormListMenuAction.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormListMenuAction.zpt @@ -29,27 +29,8 @@ - - - assertElementPresent - //div[@data-gadget-scope='header']//button[text()='Menu' and @type='submit'] - - - - assertElementNotPresent - //div[@data-gadget-scope='panel' and contains(@class, 'visible')] - - - - click - //div[@data-gadget-scope='header']//button[text()='Menu' and @type='submit'] - - - - waitForElementPresent - //div[@data-gadget-scope='panel' and contains(@class, 'visible')] - - + + diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormListMenuActionLink.xml b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormListMenuActionLink.xml new file mode 100644 index 0000000000000000000000000000000000000000..6e96fe13ffc3072d92c525f7f6ad97ac9eec11b7 --- /dev/null +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormListMenuActionLink.xml @@ -0,0 +1,58 @@ + + + + + + + + + + _bind_names + + + + + + + + + + _asgns + + + + name_subpath + traverse_subpath + + + + + + + + + + + content_type + text/html + + + expand + 0 + + + id + testFormListMenuActionLink + + + output_encoding + utf-8 + + + title + + + + + + diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormListMenuActionLink.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormListMenuActionLink.zpt new file mode 100644 index 0000000000000000000000000000000000000000..67fb8db333f5627b1a0508044f4be87b8843bb94 --- /dev/null +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormListMenuActionLink.zpt @@ -0,0 +1,57 @@ + + + +Test Form View Editable Save Action + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Test Default Module View
open${base_url}/web_site_module/renderjs_runner/#/foo_module
waitForElementPresent//div[@data-gadget-url='${base_url}/web_site_module/renderjs_runner/gadget_erp5_pt_form_list.html']
waitForTextPresentAdd
assertElementPresent//div[@data-gadget-scope='panel' and contains(@class, 'visible')]//a[text()='Do Nothing Action']
click//div[@data-gadget-scope='panel']//a[text()='Do Nothing Action']
waitForElementPresent//div[@data-gadget-url='${base_url}/web_site_module/renderjs_runner/gadget_erp5_pt_form_dialog.html']
+ + \ No newline at end of file diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormListMenuViewLink.xml b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormListMenuViewLink.xml new file mode 100644 index 0000000000000000000000000000000000000000..22f0e7ab3331d63e393ba06a4da62aa6448fc3ad --- /dev/null +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormListMenuViewLink.xml @@ -0,0 +1,58 @@ + + + + + + + + + + _bind_names + + + + + + + + + + _asgns + + + + name_subpath + traverse_subpath + + + + + + + + + + + content_type + text/html + + + expand + 0 + + + id + testFormListMenuViewLink + + + output_encoding + utf-8 + + + title + + + + + + diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormListMenuViewLink.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormListMenuViewLink.zpt new file mode 100644 index 0000000000000000000000000000000000000000..294abb6fa2640b9756bb7da7218946ea3618e576 --- /dev/null +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormListMenuViewLink.zpt @@ -0,0 +1,53 @@ + + + +Test Default Module View + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Test Default Module View
open${base_url}/web_site_module/renderjs_runner/#/foo_module
waitForElementPresent//div[@data-gadget-url='${base_url}/web_site_module/renderjs_runner/gadget_erp5_pt_form_list.html']
waitForTextPresentAdd
assertElementPresent//div[@data-gadget-scope='panel' and contains(@class, 'visible')]//a[text()='List']
click//div[@data-gadget-scope='panel']//a[text()='List']
waitForElementPresent//div[@data-gadget-url='${base_url}/web_site_module/renderjs_runner/gadget_erp5_pt_form_list.html']
+ + \ No newline at end of file diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormViewEditableMenuAction.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormViewEditableMenuAction.zpt index dba9e9ed763e046bcb746ee51fb9b73a39e4a114..c4d474de8556ad7448718ec9f8c9cc689fc35580 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormViewEditableMenuAction.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormViewEditableMenuAction.zpt @@ -30,26 +30,7 @@ - - assertElementPresent - //div[@data-gadget-scope='header']//button[text()='Menu' and @type='submit'] - - - - assertElementNotPresent - //div[@data-gadget-scope='panel' and contains(@class, 'visible')] - - - - click - //div[@data-gadget-scope='header']//button[text()='Menu' and @type='submit'] - - - - waitForElementPresent - //div[@data-gadget-scope='panel' and contains(@class, 'visible')] - - + diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormViewMenuAction.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormViewMenuAction.zpt index decb93d2dd93e084260fa1432a2c52b29cb48b1c..97676448d5c1c0db9f0dc4425f6a15600942f198 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormViewMenuAction.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormViewMenuAction.zpt @@ -30,26 +30,7 @@ - - assertElementPresent - //div[@data-gadget-scope='header']//button[text()='Menu' and @type='submit'] - - - - assertElementNotPresent - //div[@data-gadget-scope='panel' and contains(@class, 'visible')] - - - - click - //div[@data-gadget-scope='header']//button[text()='Menu' and @type='submit'] - - - - waitForElementPresent - //div[@data-gadget-scope='panel' and contains(@class, 'visible')] - - + diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageActionMenuAction.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageActionMenuAction.zpt index 8590ad25d66f8df00c52d600e25085106cbf6b9c..37e357ba67b7573e093920645a3d2e1096024dc4 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageActionMenuAction.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageActionMenuAction.zpt @@ -30,26 +30,7 @@ - - assertElementPresent - //div[@data-gadget-scope='header']//button[text()='Menu' and @type='submit'] - - - - assertElementNotPresent - //div[@data-gadget-scope='panel' and contains(@class, 'visible')] - - - - click - //div[@data-gadget-scope='header']//button[text()='Menu' and @type='submit'] - - - - waitForElementPresent - //div[@data-gadget-scope='panel' and contains(@class, 'visible')] - - + diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageExportMenuAction.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageExportMenuAction.zpt index c77f6f2a378f953867705a88ec450691119289f0..b4474d8782caf11d70999a06338314c280104815 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageExportMenuAction.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageExportMenuAction.zpt @@ -31,26 +31,7 @@ - - assertElementPresent - //div[@data-gadget-scope='header']//button[text()='Menu' and @type='submit'] - - - - assertElementNotPresent - //div[@data-gadget-scope='panel' and contains(@class, 'visible')] - - - - click - //div[@data-gadget-scope='header']//button[text()='Menu' and @type='submit'] - - - - waitForElementPresent - //div[@data-gadget-scope='panel' and contains(@class, 'visible')] - - + diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageFrontMenuAction.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageFrontMenuAction.zpt index c18a38bb6e97427d9ecb04a5e2176377b943eeec..7b0088da6aca67a58e0b769d1da965abfd8b9fdc 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageFrontMenuAction.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageFrontMenuAction.zpt @@ -30,26 +30,7 @@ - - assertElementPresent - //div[@data-gadget-scope='header']//button[text()='Menu' and @type='submit'] - - - - assertElementNotPresent - //div[@data-gadget-scope='panel' and contains(@class, 'visible')] - - - - click - //div[@data-gadget-scope='header']//button[text()='Menu' and @type='submit'] - - - - waitForElementPresent - //div[@data-gadget-scope='panel' and contains(@class, 'visible')] - - + diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageHistoryDocumentListOnlyShowModuleSubDocuments.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageHistoryDocumentListOnlyShowModuleSubDocuments.zpt index 43406cf102b9fedadb591883f3ba1ee93056d725..d279420a1e7caecf1f0d8a92f53523e1dcee21ad 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageHistoryDocumentListOnlyShowModuleSubDocuments.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageHistoryDocumentListOnlyShowModuleSubDocuments.zpt @@ -87,21 +87,7 @@ ${base_url}/web_site_module/renderjs_runner/ - - waitForElementPresent - //div[@data-gadget-scope='header']//button[text()='Menu' and @type='submit'] - - - - click - //div[@data-gadget-scope='header']//button[text()='Menu' and @type='submit'] - - - - waitForElementPresent - //div[@data-gadget-scope='panel' and contains(@class, 'visible')] - - + click //div[@data-gadget-scope='panel']//a[text()='History'] diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageHistoryDocumentListOrderedByAccessTime.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageHistoryDocumentListOrderedByAccessTime.zpt index 299ca3e9d4ef452f6ed1cfa6904c5cdaaf6e1cf0..1d53823705855b6570707c59b315a1def3e63a91 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageHistoryDocumentListOrderedByAccessTime.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageHistoryDocumentListOrderedByAccessTime.zpt @@ -107,21 +107,7 @@ - - waitForElementPresent - //div[@data-gadget-scope='header']//button[text()='Menu' and @type='submit'] - - - - click - //div[@data-gadget-scope='header']//button[text()='Menu' and @type='submit'] - - - - waitForElementPresent - //div[@data-gadget-scope='panel' and contains(@class, 'visible')] - - + click //div[@data-gadget-scope='panel']//a[text()='History'] @@ -170,21 +156,7 @@ - - waitForElementPresent - //div[@data-gadget-scope='header']//button[text()='Menu' and @type='submit'] - - - - click - //div[@data-gadget-scope='header']//button[text()='Menu' and @type='submit'] - - - - waitForElementPresent - //div[@data-gadget-scope='panel' and contains(@class, 'visible')] - - + click //div[@data-gadget-scope='panel']//a[text()='History'] diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageHistoryMenuAction.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageHistoryMenuAction.zpt index 46f3e8aca90b366f3a2d016d6c21c99cc353a268..f32587f03523c2c6a3ad633c26aa943d597a1a2d 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageHistoryMenuAction.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageHistoryMenuAction.zpt @@ -30,26 +30,7 @@ - - assertElementPresent - //div[@data-gadget-scope='header']//button[text()='Menu' and @type='submit'] - - - - assertElementNotPresent - //div[@data-gadget-scope='panel' and contains(@class, 'visible')] - - - - click - //div[@data-gadget-scope='header']//button[text()='Menu' and @type='submit'] - - - - waitForElementPresent - //div[@data-gadget-scope='panel' and contains(@class, 'visible')] - - + diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageJumpMenuAction.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageJumpMenuAction.zpt index 1d931d23ae0857f480122585520936f0eeda1da6..30342c64dc70d505ca831420861afb4013783be3 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageJumpMenuAction.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageJumpMenuAction.zpt @@ -30,26 +30,7 @@ - - assertElementPresent - //div[@data-gadget-scope='header']//button[text()='Menu' and @type='submit'] - - - - assertElementNotPresent - //div[@data-gadget-scope='panel' and contains(@class, 'visible')] - - - - click - //div[@data-gadget-scope='header']//button[text()='Menu' and @type='submit'] - - - - waitForElementPresent - //div[@data-gadget-scope='panel' and contains(@class, 'visible')] - - + diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPagePreferenceMenuAction.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPagePreferenceMenuAction.zpt index 8b8aec86a78db512553ef6b46a5358aa39c4c0e6..d6496ecaa153758dcff92e68519b39382c099974 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPagePreferenceMenuAction.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPagePreferenceMenuAction.zpt @@ -25,26 +25,7 @@ - - assertElementPresent - //div[@data-gadget-scope='header']//button[text()='Menu' and @type='submit'] - - - - assertElementNotPresent - //div[@data-gadget-scope='panel' and contains(@class, 'visible')] - - - - click - //div[@data-gadget-scope='header']//button[text()='Menu' and @type='submit'] - - - - waitForElementPresent - //div[@data-gadget-scope='panel' and contains(@class, 'visible')] - - + diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageSearchMenuAction.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageSearchMenuAction.zpt index e6d253be5ef215ab81aae664378c4949cb41711f..480d2214461aa55f4bf43c6856849ddd890570ab 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageSearchMenuAction.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageSearchMenuAction.zpt @@ -30,26 +30,7 @@ - - assertElementPresent - //div[@data-gadget-scope='header']//button[text()='Menu' and @type='submit'] - - - - assertElementNotPresent - //div[@data-gadget-scope='panel' and contains(@class, 'visible')] - - - - click - //div[@data-gadget-scope='header']//button[text()='Menu' and @type='submit'] - - - - waitForElementPresent - //div[@data-gadget-scope='panel' and contains(@class, 'visible')] - - + diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageTabMenuAction.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageTabMenuAction.zpt index a2c1b6e0205bea03280c7e041eaaa2758d3e663c..c60d35a8b45eb8c840ddf6426ac0218529d0baed 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageTabMenuAction.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageTabMenuAction.zpt @@ -30,26 +30,7 @@ - - assertElementPresent - //div[@data-gadget-scope='header']//button[text()='Menu' and @type='submit'] - - - - assertElementNotPresent - //div[@data-gadget-scope='panel' and contains(@class, 'visible')] - - - - click - //div[@data-gadget-scope='header']//button[text()='Menu' and @type='submit'] - - - - waitForElementPresent - //div[@data-gadget-scope='panel' and contains(@class, 'visible')] - - + diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageWorklistMenuAction.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageWorklistMenuAction.zpt index 42fdb024998dee1425deb7fd54f2293f0533a9ee..29c93c02f5f3a0a8580e21ebf6c306bd19117859 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageWorklistMenuAction.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageWorklistMenuAction.zpt @@ -30,26 +30,7 @@ - - assertElementPresent - //div[@data-gadget-scope='header']//button[text()='Menu' and @type='submit'] - - - - assertElementNotPresent - //div[@data-gadget-scope='panel' and contains(@class, 'visible')] - - - - click - //div[@data-gadget-scope='header']//button[text()='Menu' and @type='submit'] - - - - waitForElementPresent - //div[@data-gadget-scope='panel' and contains(@class, 'visible')] - - + diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_router_zuite/testCommandDisplayStoredStateJumpToLatestDocumentContext.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_router_zuite/testCommandDisplayStoredStateJumpToLatestDocumentContext.zpt index 430b1bdd45e9e6a4341bc4037ca1a1489bf039d8..c68dc71bab50fdd2c6448e7b2843cca52fcbee26 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_router_zuite/testCommandDisplayStoredStateJumpToLatestDocumentContext.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_router_zuite/testCommandDisplayStoredStateJumpToLatestDocumentContext.zpt @@ -28,16 +28,7 @@ - - click - //div[@data-gadget-scope='header']//button[text()='Menu' and @type='submit'] - - - - waitForElementPresent - //div[@data-gadget-scope='panel' and contains(@class, 'visible')] - - + click //div[@data-gadget-scope='panel']//a[text()='Modules'] diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_translate_zuite/testPageHistory.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_translate_zuite/testPageHistory.zpt index 85849740673f0b7f5a0970e5c144ad5b5518ee1e..e3653e7f0f047e78d6887ff86422d1334626ea10 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_translate_zuite/testPageHistory.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_translate_zuite/testPageHistory.zpt @@ -97,21 +97,7 @@ - - waitForElementNotPresent - //div[@data-gadget-scope='panel' and contains(@class, 'visible')] - - - - waitForElementPresent - //div[@data-gadget-scope='header']//button[text()='Menu' and @type='submit'] - - - - click - //div[@data-gadget-scope='header']//button[text()='Menu' and @type='submit'] - - + waitForElementPresent //div[@data-gadget-scope='panel' and contains(@class, 'visible')]//a[text()='lishi'] diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_translate_zuite/testPanel.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_translate_zuite/testPanel.zpt index 421f0581c0c34d3bada6a674d450d10b93ed2c50..332ec2343412237dcd7c8190453507c32aaec454 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_translate_zuite/testPanel.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_translate_zuite/testPanel.zpt @@ -98,7 +98,7 @@ link=Title 1 - + waitForElementPresent //div[@data-gadget-scope='panel']//dt[@class="ui-btn-icon-left ui-icon-eye"] diff --git a/bt5/erp5_web_renderjs_ui_test/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui_test/Base_createBaseLanguage.py b/bt5/erp5_web_renderjs_ui_test/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui_test/Base_createBaseLanguage.py index b9af754d21e7046c0be1342f7180dabd9cb643e4..15f41b87c1e9e4edcd48d666e799965676e4bc24 100644 --- a/bt5/erp5_web_renderjs_ui_test/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui_test/Base_createBaseLanguage.py +++ b/bt5/erp5_web_renderjs_ui_test/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui_test/Base_createBaseLanguage.py @@ -75,6 +75,7 @@ param_dict = [ { 'message': 'Foo Category', 'translation': 'Foo leibie', 'language': 'wo'}, { 'message': 'Configure', 'translation': 'peizhi', 'language': 'wo'}, { 'message': 'Configure Editor', 'translation': 'peizhibianjiqi', 'language': 'wo'}, + { 'message': 'List', 'translation': 'liebiao', 'language': 'wo'}, { 'message': 'This page contains unsaved changes, do you really want to leave the page ?', 'translation': 'querenlikai?', 'language': 'wo'} ] for tmp in param_dict: diff --git a/bt5/erp5_web_renderjs_ui_test/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui_test/Zuite_CommonTemplateForRenderjsUi.zpt b/bt5/erp5_web_renderjs_ui_test/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui_test/Zuite_CommonTemplateForRenderjsUi.zpt index c8b8ca6a19450a22c84985f775c6ae6a72927169..9383fe44ce5f7ee6243dfe5a8df47303754a40c1 100644 --- a/bt5/erp5_web_renderjs_ui_test/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui_test/Zuite_CommonTemplateForRenderjsUi.zpt +++ b/bt5/erp5_web_renderjs_ui_test/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui_test/Zuite_CommonTemplateForRenderjsUi.zpt @@ -1783,4 +1783,28 @@ + + + Open Menu Panel + + + waitForElementPresent + //div[@data-gadget-scope='header']//button[@data-i18n='Menu' and @type='submit'] + + + + click + //div[@data-gadget-scope='header']//button[@data-i18n='Menu' and @type='submit'] + + + + waitForElementPresent + //div[@data-gadget-scope='panel' and contains(@class, 'visible')] + + + +

+ + + \ No newline at end of file diff --git a/bt5/erp5_web_renderjs_ui_test/bt/template_path_list b/bt5/erp5_web_renderjs_ui_test/bt/template_path_list index da46433f13aa1b22eb6d2680d5ac8f12efd76598..cf468376c02fe448e2986d2e9677a7d7aa0270d7 100644 --- a/bt5/erp5_web_renderjs_ui_test/bt/template_path_list +++ b/bt5/erp5_web_renderjs_ui_test/bt/template_path_list @@ -10,10 +10,10 @@ portal_tests/renderjs_ui_float_field_zuite portal_tests/renderjs_ui_float_field_zuite/** portal_tests/renderjs_ui_form_box_zuite portal_tests/renderjs_ui_form_box_zuite/** -portal_tests/renderjs_ui_label_field_zuite -portal_tests/renderjs_ui_label_field_zuite/** portal_tests/renderjs_ui_interface_validator_zuite portal_tests/renderjs_ui_interface_validator_zuite/** +portal_tests/renderjs_ui_label_field_zuite +portal_tests/renderjs_ui_label_field_zuite/** portal_tests/renderjs_ui_lines_field_zuite portal_tests/renderjs_ui_lines_field_zuite/** portal_tests/renderjs_ui_list_field_zuite @@ -48,4 +48,4 @@ portal_tests/renderjs_ui_translate_zuite portal_tests/renderjs_ui_translate_zuite/** portal_tests/renderjs_ui_zuite portal_tests/renderjs_ui_zuite/** -web_page_module/gadget_erp5_page_router_test_* +web_page_module/gadget_erp5_page_router_test_* \ No newline at end of file