diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_appcache.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_appcache.xml index 0321c3932352460254a19920d76ffea59da7929a..dab96213ccf7390847333e8630838f5de6484ce0 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_appcache.xml +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_appcache.xml @@ -108,7 +108,7 @@ <value> <string encoding="cdata"><![CDATA[ CACHE MANIFEST\n -# generated on Mon, 07 Apr 2016 10:30:00 GMT\n +# generated on Mon, 11 Apr 2016 14:30:00 GMT\n # XXX + fonts\n # images/ajax-loader.gif\n CACHE:\n @@ -211,6 +211,7 @@ gadget_erp5_searchfield.js\n gadget_erp5_sort_editor.html\n gadget_erp5_sort_editor.js\n gadget_global.js\n +gadget_erp5_global.js\n gadget_jio.html\n gadget_jio.js\n gadget_translation.html\n @@ -356,7 +357,7 @@ NETWORK:\n </item> <item> <key> <string>serial</string> </key> - <value> <string>950.22851.261.49698</string> </value> + <value> <string>950.28770.51995.64546</string> </value> </item> <item> <key> <string>state</string> </key> @@ -374,7 +375,7 @@ NETWORK:\n </tuple> <state> <tuple> - <float>1460023873.3</float> + <float>1460381405.36</float> <string>UTC</string> </tuple> </state> diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_global_js.js b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_global_js.js new file mode 100644 index 0000000000000000000000000000000000000000..96f5e2ad990d9400aac46f134f3fccb00494230d --- /dev/null +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_global_js.js @@ -0,0 +1,18 @@ +/*global window, RSVP */ +/*jslint indent: 2, maxerr: 3, nomen: true, unparam: true */ +(function (window, RSVP) { + "use strict"; + + window.calculatePageTitle = function (gadget, erp5_document) { + return new RSVP.Queue() + .push(function () { + var title = erp5_document.title, + portal_type = erp5_document._links.type.name; + if (/ Module$/.test(portal_type)) { + return portal_type; + } + return portal_type + ': ' + title; + }); + }; + +}(window, RSVP)); \ No newline at end of file diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_global_js.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_global_js.xml new file mode 100644 index 0000000000000000000000000000000000000000..769c71ad84acc78f1f4fec0a4654a4cfa2dd64e0 --- /dev/null +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_global_js.xml @@ -0,0 +1,320 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <global name="Web Script" module="erp5.portal_type"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_Access_contents_information_Permission</string> </key> + <value> + <tuple> + <string>Anonymous</string> + <string>Assignee</string> + <string>Assignor</string> + <string>Associate</string> + <string>Auditor</string> + <string>Manager</string> + <string>Owner</string> + </tuple> + </value> + </item> + <item> + <key> <string>_Add_portal_content_Permission</string> </key> + <value> + <tuple> + <string>Assignee</string> + <string>Assignor</string> + <string>Manager</string> + </tuple> + </value> + </item> + <item> + <key> <string>_Change_local_roles_Permission</string> </key> + <value> + <tuple> + <string>Assignor</string> + <string>Manager</string> + </tuple> + </value> + </item> + <item> + <key> <string>_Modify_portal_content_Permission</string> </key> + <value> + <tuple> + <string>Assignee</string> + <string>Assignor</string> + <string>Manager</string> + </tuple> + </value> + </item> + <item> + <key> <string>_View_Permission</string> </key> + <value> + <tuple> + <string>Anonymous</string> + <string>Assignee</string> + <string>Assignor</string> + <string>Associate</string> + <string>Auditor</string> + <string>Manager</string> + <string>Owner</string> + </tuple> + </value> + </item> + <item> + <key> <string>content_md5</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>default_reference</string> </key> + <value> <string>gadget_erp5_global.js</string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>rjs_gadget_erp5_global_js</string> </value> + </item> + <item> + <key> <string>language</string> </key> + <value> <string>en</string> </value> + </item> + <item> + <key> <string>portal_type</string> </key> + <value> <string>Web Script</string> </value> + </item> + <item> + <key> <string>short_title</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>gadget_erp5_global.js</string> </value> + </item> + <item> + <key> <string>version</string> </key> + <value> <string>001</string> </value> + </item> + <item> + <key> <string>workflow_history</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <global name="PersistentMapping" module="Persistence.mapping"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>data</string> </key> + <value> + <dictionary> + <item> + <key> <string>document_publication_workflow</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + </value> + </item> + <item> + <key> <string>edit_workflow</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> + </value> + </item> + <item> + <key> <string>processing_status_workflow</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent> + </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="3" aka="AAAAAAAAAAM="> + <pickle> + <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/> + </pickle> + <pickle> + <tuple> + <none/> + <list> + <dictionary> + <item> + <key> <string>action</string> </key> + <value> <string>publish_alive</string> </value> + </item> + <item> + <key> <string>actor</string> </key> + <value> <string>zope</string> </value> + </item> + <item> + <key> <string>comment</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>error_message</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>time</string> </key> + <value> + <object> + <klass> + <global name="DateTime" module="DateTime.DateTime"/> + </klass> + <tuple> + <none/> + </tuple> + <state> + <tuple> + <float>1460378213.06</float> + <string>UTC</string> + </tuple> + </state> + </object> + </value> + </item> + <item> + <key> <string>validation_state</string> </key> + <value> <string>published_alive</string> </value> + </item> + </dictionary> + </list> + </tuple> + </pickle> + </record> + <record id="4" aka="AAAAAAAAAAQ="> + <pickle> + <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/> + </pickle> + <pickle> + <tuple> + <none/> + <list> + <dictionary> + <item> + <key> <string>action</string> </key> + <value> <string>edit</string> </value> + </item> + <item> + <key> <string>actor</string> </key> + <value> <string>zope</string> </value> + </item> + <item> + <key> <string>comment</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>error_message</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>serial</string> </key> + <value> <string>950.28789.14822.18670</string> </value> + </item> + <item> + <key> <string>state</string> </key> + <value> <string>current</string> </value> + </item> + <item> + <key> <string>time</string> </key> + <value> + <object> + <klass> + <global name="DateTime" module="DateTime.DateTime"/> + </klass> + <tuple> + <none/> + </tuple> + <state> + <tuple> + <float>1460380170.56</float> + <string>UTC</string> + </tuple> + </state> + </object> + </value> + </item> + </dictionary> + </list> + </tuple> + </pickle> + </record> + <record id="5" aka="AAAAAAAAAAU="> + <pickle> + <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/> + </pickle> + <pickle> + <tuple> + <none/> + <list> + <dictionary> + <item> + <key> <string>action</string> </key> + <value> <string>detect_converted_file</string> </value> + </item> + <item> + <key> <string>actor</string> </key> + <value> <string>zope</string> </value> + </item> + <item> + <key> <string>comment</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>error_message</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>external_processing_state</string> </key> + <value> <string>converted</string> </value> + </item> + <item> + <key> <string>serial</string> </key> + <value> <string>0.0.0.0</string> </value> + </item> + <item> + <key> <string>time</string> </key> + <value> + <object> + <klass> + <global name="DateTime" module="DateTime.DateTime"/> + </klass> + <tuple> + <none/> + </tuple> + <state> + <tuple> + <float>1460378084.72</float> + <string>UTC</string> + </tuple> + </state> + </object> + </value> + </item> + </dictionary> + </list> + </tuple> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_js.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_js.xml index 13f2b4f39aeb056b055ea35d9034b1e1d81fdf8b..6e08cf6fc1a96f9a7d28de5900513e2c3bfda43d 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_js.xml +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_js.xml @@ -236,7 +236,7 @@ </item> <item> <key> <string>serial</string> </key> - <value> <string>949.25536.57875.14165</string> </value> + <value> <string>950.24504.62713.15360</string> </value> </item> <item> <key> <string>state</string> </key> @@ -254,7 +254,7 @@ </tuple> <state> <tuple> - <float>1456426686.64</float> + <float>1460362264.77</float> <string>UTC</string> </tuple> </state> diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_search_html.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_search_html.xml index dde39cb32a76b19490b384685e6b59f089965952..320d8ac9be76e810565fa2cb6b9d86d29013b1cf 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_search_html.xml +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_search_html.xml @@ -234,7 +234,7 @@ </item> <item> <key> <string>serial</string> </key> - <value> <string>949.53828.65434.1638</string> </value> + <value> <string>950.28765.38539.13653</string> </value> </item> <item> <key> <string>state</string> </key> @@ -252,7 +252,7 @@ </tuple> <state> <tuple> - <float>1457950556.56</float> + <float>1460378755.69</float> <string>UTC</string> </tuple> </state> diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_search_js.js b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_search_js.js index 10c45fe4d3e9e7ffc9ab0da02ed785e0db78857b..ae22a8ea837a8168c1cdd6ff595cb5ff3f0ccfb3 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_search_js.js +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_search_js.js @@ -101,8 +101,12 @@ "editable": 1 } }}, - "_links": {} - }, + "_links": { + "type": { + // form_list display portal_type in header + name: "" + } + }}, form_definition: { group_list: [[ "bottom", diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_search_js.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_search_js.xml index 3adb3a32ac9bcb0cba8ebbd89a4f687359c6536a..a109951fcd138ed5c393d151836646d33388a521 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_search_js.xml +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_search_js.xml @@ -230,7 +230,7 @@ </item> <item> <key> <string>serial</string> </key> - <value> <string>949.63941.3687.12936</string> </value> + <value> <string>950.28737.36313.33262</string> </value> </item> <item> <key> <string>state</string> </key> @@ -248,7 +248,7 @@ </tuple> <state> <tuple> - <float>1458557180.6</float> + <float>1460377090.92</float> <string>UTC</string> </tuple> </state> diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_actionpage_html.html b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_actionpage_html.html index 3e23e46a5f14b83f175cf942165aabb3fc92e2bf..4739943331a29b4bfa5ebafa12e569bf781c60d8 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_actionpage_html.html +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_actionpage_html.html @@ -13,6 +13,7 @@ <!-- custom script --> <script src="gadget_global.js" type="text/javascript"></script> + <script src="gadget_erp5_global.js" type="text/javascript"></script> <script src="gadget_erp5_page_action.js" type="text/javascript"></script> <!-- XXX need theme here currently --> diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_actionpage_html.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_actionpage_html.xml index c1fdfbc14fbfd3614a9c4bb3d6ee868107e74d87..a87a1bad7fde780458c249d0d9814401626184b2 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_actionpage_html.xml +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_actionpage_html.xml @@ -234,7 +234,7 @@ </item> <item> <key> <string>serial</string> </key> - <value> <string>949.6674.56490.63948</string> </value> + <value> <string>949.53789.19765.27784</string> </value> </item> <item> <key> <string>state</string> </key> @@ -252,7 +252,7 @@ </tuple> <state> <tuple> - <float>1455548880.29</float> + <float>1460378795.97</float> <string>UTC</string> </tuple> </state> diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_actionpage_js.js b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_actionpage_js.js index b9e752a0e12fdf972c14fce355aa8e47b4f137e2..16a42aca98e0a19c535d016fe78f39bee286b8c5 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_actionpage_js.js +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_actionpage_js.js @@ -1,6 +1,6 @@ -/*global window, rJS, RSVP, Handlebars */ +/*global window, rJS, RSVP, Handlebars, calculatePageTitle */ /*jslint nomen: true, indent: 2, maxerr: 3 */ -(function (window, rJS, RSVP, Handlebars) { +(function (window, rJS, RSVP, Handlebars, calculatePageTitle) { "use strict"; ///////////////////////////////////////////////////////////////// @@ -93,23 +93,26 @@ if (erp5_document._links.action_object_clone_action) { action = tab_list.pop(); } - return gadget.translateHtml(table_template({ - definition_title: "Workflow Transitions", - documentlist: tab_list, - definition_i18n: "Workflow-Transitions", - section_i18n: "Actions", - section_title: "Actions", - action: action - })); + return RSVP.all([ + gadget.translateHtml(table_template({ + definition_title: "Workflow Transitions", + documentlist: tab_list, + definition_i18n: "Workflow-Transitions", + section_i18n: "Actions", + section_title: "Actions", + action: action + })), + calculatePageTitle(gadget, erp5_document) + ]); }) - .push(function (my_translated_html) { - gadget.props.element.innerHTML = my_translated_html; + .push(function (last_result_list) { + gadget.props.element.innerHTML = last_result_list[0]; return gadget.updateHeader({ back_url: result_list[0], - page_title: erp5_document.title + page_title: last_result_list[1] }); }); }); -}(window, rJS, RSVP, Handlebars)); \ No newline at end of file +}(window, rJS, RSVP, Handlebars, calculatePageTitle)); \ No newline at end of file diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_actionpage_js.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_actionpage_js.xml index 7d40708ddba707e892276dd243d77ebdacde0fca..d66cee4602f9e2dec7de2e05f915fb85d12bf3dc 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_actionpage_js.xml +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_actionpage_js.xml @@ -230,7 +230,7 @@ </item> <item> <key> <string>serial</string> </key> - <value> <string>950.21620.6361.8277</string> </value> + <value> <string>950.28791.23999.5956</string> </value> </item> <item> <key> <string>state</string> </key> @@ -248,7 +248,7 @@ </tuple> <state> <tuple> - <float>1459950557.16</float> + <float>1460380327.89</float> <string>UTC</string> </tuple> </state> diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_dialog_html.html b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_dialog_html.html index 2be35f30e6e16e03f2041bc25f404be69549d454..11c1fa641b801e52e9002bd3812a17b8e9a3adc6 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_dialog_html.html +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_dialog_html.html @@ -12,6 +12,7 @@ <!-- custom script --> <script src="gadget_global.js" type="text/javascript"></script> + <script src="gadget_erp5_global.js" type="text/javascript"></script> <script src="gadget_erp5_pt_form_dialog.js" type="text/javascript"></script> </head> diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_dialog_html.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_dialog_html.xml index 172f7e58b537e505c446a262bd38fb1a9371ed73..88590da2c4f2fb0629a1806c5e364d50b46d4e1e 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_dialog_html.xml +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_dialog_html.xml @@ -220,7 +220,7 @@ </item> <item> <key> <string>actor</string> </key> - <value> <string>super_sven</string> </value> + <value> <string>zope</string> </value> </item> <item> <key> <string>comment</string> </key> @@ -234,7 +234,7 @@ </item> <item> <key> <string>serial</string> </key> - <value> <string>939.43978.9403.31744</string> </value> + <value> <string>946.44927.40202.16725</string> </value> </item> <item> <key> <string>state</string> </key> @@ -252,8 +252,8 @@ </tuple> <state> <tuple> - <float>1419347929.19</float> - <string>GMT</string> + <float>1460379182.94</float> + <string>UTC</string> </tuple> </state> </object> diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_dialog_js.js b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_dialog_js.js index 82c0f3ef28a61ee2b9cecd5b97e3619173239f11..ada72a69e57bbb0b341f7e9ca52e24edf1305e28 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_dialog_js.js +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_dialog_js.js @@ -1,6 +1,6 @@ /*jslint nomen: true, indent: 2, maxerr: 3 */ -/*global window, rJS, RSVP, URI, loopEventListener, document */ -(function (window, rJS, RSVP, URI, loopEventListener) { +/*global window, rJS, RSVP, URI, loopEventListener, document, calculatePageTitle */ +(function (window, rJS, RSVP, URI, loopEventListener, calculatePageTitle) { "use strict"; ///////////////////////////////////////////////////////////////// @@ -112,13 +112,14 @@ section.innerHTML = my_translation_html; return RSVP.all([ erp5_form.render(form_options), - form_gadget.getUrlFor({command: 'change', options: {page: undefined, view: undefined}}) + form_gadget.getUrlFor({command: 'change', options: {page: undefined, view: undefined}}), + calculatePageTitle(form_gadget, options.erp5_document) ]); }) .push(function (all_result) { return form_gadget.updateHeader({ cancel_url: all_result[1], - page_title: options.erp5_document.title, + page_title: all_result[2], submit_action: true }); }); @@ -201,4 +202,4 @@ ); }); -}(window, rJS, RSVP, URI, loopEventListener)); \ No newline at end of file +}(window, rJS, RSVP, URI, loopEventListener, calculatePageTitle)); \ No newline at end of file diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_dialog_js.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_dialog_js.xml index 3e8de5a094c17914a8ddc14aa620f5b5c42f6743..ffe9709eac60b578944f23315e9fb1eaf8794b5f 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_dialog_js.xml +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_dialog_js.xml @@ -230,7 +230,7 @@ </item> <item> <key> <string>serial</string> </key> - <value> <string>949.54154.3158.28962</string> </value> + <value> <string>950.28774.6948.60706</string> </value> </item> <item> <key> <string>state</string> </key> @@ -248,7 +248,7 @@ </tuple> <state> <tuple> - <float>1459949953.41</float> + <float>1460380958.69</float> <string>UTC</string> </tuple> </state> diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_list_html.html b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_list_html.html index de0ca60f2f388b287eb7c5436e958f7b82278c23..97cf6a205b65f57a1d0784ae9c56fb7bf0abfad5 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_list_html.html +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_list_html.html @@ -11,6 +11,7 @@ <!-- custom script --> <script src="gadget_global.js" type="text/javascript"></script> + <script src="gadget_erp5_global.js" type="text/javascript"></script> <script src="gadget_erp5_pt_form_list.js" type="text/javascript"></script> </head> diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_list_html.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_list_html.xml index 1c32d3427a76e63bbaa4b9402cf6ca9a5a6218f0..06ee4093a6dbf6f4bd34bbbe3d5b034da1f14b88 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_list_html.xml +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_list_html.xml @@ -220,7 +220,7 @@ </item> <item> <key> <string>actor</string> </key> - <value> <string>romain</string> </value> + <value> <string>zope</string> </value> </item> <item> <key> <string>comment</string> </key> @@ -234,7 +234,7 @@ </item> <item> <key> <string>serial</string> </key> - <value> <string>945.61017.50891.24046</string> </value> + <value> <string>946.44927.40202.16725</string> </value> </item> <item> <key> <string>state</string> </key> @@ -252,8 +252,8 @@ </tuple> <state> <tuple> - <float>1442998685.54</float> - <string>GMT</string> + <float>1460379295.13</float> + <string>UTC</string> </tuple> </state> </object> diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_list_js.js b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_list_js.js index 9eca58832a2cb61c9c9163aafc5885254503702a..c98c018ff639aff4e6fa8e44d61cc0440c800945 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_list_js.js +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_list_js.js @@ -1,6 +1,6 @@ -/*global window, rJS, RSVP, loopEventListener */ +/*global window, rJS, RSVP, loopEventListener, calculatePageTitle */ /*jslint nomen: true, indent: 2, maxerr: 3 */ -(function (window, rJS, RSVP, loopEventListener) { +(function (window, rJS, RSVP, loopEventListener, calculatePageTitle) { "use strict"; rJS(window) @@ -29,7 +29,7 @@ .declareAcquiredMethod("getUrlParameter", "getUrlParameter") .allowPublicAcquisition("getListboxInfo", function () { return this.getDeclaredGadget("erp5_form") - .push(function(form_gadget) { + .push(function (form_gadget) { return form_gadget.getListboxInfo(); }); }) @@ -70,7 +70,8 @@ gadget.getDeclaredGadget("erp5_form"), new_content_action, gadget.getUrlFor({command: 'change', options: {page: "action"}}), - gadget.getUrlFor({command: 'display', options: {}}) + gadget.getUrlFor({command: 'display', options: {}}), + calculatePageTitle(gadget, options.erp5_document) ]); }) .push(function (all_gadget) { @@ -84,7 +85,7 @@ add_url: all_gadget[2], actions_url: all_gadget[3], export_url: "", - page_title: options.erp5_document.title, + page_title: all_gadget[5], front_url: all_gadget[4] }) @@ -124,4 +125,4 @@ ); }); -}(window, rJS, RSVP, loopEventListener)); \ No newline at end of file +}(window, rJS, RSVP, loopEventListener, calculatePageTitle)); \ No newline at end of file diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_list_js.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_list_js.xml index 4d5374872df8c6a4fc2f728eb1dc873b4d0b9551..f424335b1eb96e4e2faaf3ac6de82c69de99ea6a 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_list_js.xml +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_list_js.xml @@ -230,7 +230,7 @@ </item> <item> <key> <string>serial</string> </key> - <value> <string>950.21719.42799.7953</string> </value> + <value> <string>950.28775.58471.1331</string> </value> </item> <item> <key> <string>state</string> </key> @@ -248,7 +248,7 @@ </tuple> <state> <tuple> - <float>1459956126.43</float> + <float>1460380526.47</float> <string>UTC</string> </tuple> </state> diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_editable_html.html b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_editable_html.html index daf003fddc46fe1574b54f94172423766125deb1..0bef53e8e327a327e554fe0a1a1a969885e87999 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_editable_html.html +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_editable_html.html @@ -12,6 +12,7 @@ <!-- custom script --> <script src="gadget_global.js" type="text/javascript"></script> + <script src="gadget_erp5_global.js" type="text/javascript"></script> <script src="gadget_erp5_pt_form_view_editable.js" type="text/javascript"></script> </head> diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_editable_html.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_editable_html.xml index 64db26b88ac5a820cf6b18c61fec3b752ad370bc..782b18e1e1db4190e22fd7e37fb088aa7e3fcdd5 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_editable_html.xml +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_editable_html.xml @@ -234,7 +234,7 @@ </item> <item> <key> <string>serial</string> </key> - <value> <string>940.10457.48901.33450</string> </value> + <value> <string>946.44927.40202.16725</string> </value> </item> <item> <key> <string>state</string> </key> @@ -252,7 +252,7 @@ </tuple> <state> <tuple> - <float>1420736835.67</float> + <float>1460379409.72</float> <string>UTC</string> </tuple> </state> diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_editable_js.js b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_editable_js.js index 69cec778a27ba84d27bda01cdf9702e291dddaa8..eb65a43eca39ba152d46cc5a4a24874111e7ef20 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_editable_js.js +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_editable_js.js @@ -1,6 +1,6 @@ -/*global window, rJS, RSVP, loopEventListener, document */ +/*global window, rJS, RSVP, loopEventListener, document, calculatePageTitle */ /*jslint nomen: true, indent: 2, maxerr: 3 */ -(function (window, rJS, RSVP, loopEventListener) { +(function (window, rJS, RSVP, loopEventListener, calculatePageTitle) { "use strict"; rJS(window) @@ -80,7 +80,8 @@ form_gadget.getUrlFor({command: 'change', options: {page: "action", editable: true}}), new_content_action, form_gadget.getUrlFor({command: 'history_previous'}), - delete_action + delete_action, + calculatePageTitle(form_gadget, options.erp5_document) ]); }) .push(function (all_result) { @@ -91,7 +92,7 @@ selection_url: all_result[4], delete_url: all_result[5], cut_url: "", - page_title: options.erp5_document.title + page_title: all_result[6] }; if (form_gadget.props.action !== undefined) { header_dict.save_action = true; @@ -165,4 +166,4 @@ ); }); -}(window, rJS, RSVP, loopEventListener)); \ No newline at end of file +}(window, rJS, RSVP, loopEventListener, calculatePageTitle)); \ No newline at end of file diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_editable_js.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_editable_js.xml index 187e26e7042d62c67113e281594f84a72e8edb30..198914ef83fa68b6587e5ec6c4a95b4fbe919bfd 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_editable_js.xml +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_editable_js.xml @@ -230,7 +230,7 @@ </item> <item> <key> <string>serial</string> </key> - <value> <string>950.21392.9218.22186</string> </value> + <value> <string>950.28778.40365.28040</string> </value> </item> <item> <key> <string>state</string> </key> @@ -248,7 +248,7 @@ </tuple> <state> <tuple> - <float>1459949626.4</float> + <float>1460380770.14</float> <string>UTC</string> </tuple> </state> diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_html.html b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_html.html index 17a4dada95e27a004a6ba513225e5b979483657e..56e3088b578d3f5f4313eec00890f989d70e3f96 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_html.html +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_html.html @@ -12,6 +12,7 @@ <!-- custom script --> <script src="gadget_global.js" type="text/javascript"></script> + <script src="gadget_erp5_global.js" type="text/javascript"></script> <script src="gadget_erp5_pt_form_view.js" type="text/javascript"></script> </head> diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_html.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_html.xml index 721f10934dadcc55732d239adbdf1ecb2978f3d1..cbe845b6e19f886b6d0173883c69e78dd7533ae6 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_html.xml +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_html.xml @@ -220,7 +220,7 @@ </item> <item> <key> <string>actor</string> </key> - <value> <string>romain</string> </value> + <value> <string>zope</string> </value> </item> <item> <key> <string>comment</string> </key> @@ -234,7 +234,7 @@ </item> <item> <key> <string>serial</string> </key> - <value> <string>937.64343.1806.54016</string> </value> + <value> <string>946.44927.40202.16725</string> </value> </item> <item> <key> <string>state</string> </key> @@ -252,8 +252,8 @@ </tuple> <state> <tuple> - <float>1412342134.54</float> - <string>GMT</string> + <float>1460379399.92</float> + <string>UTC</string> </tuple> </state> </object> diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_js.js b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_js.js index 33271d76323fd236f2878ba4ff18a8b09d9ad42b..5ec2f3824bcece47f6c48a0e56e5289bb202a0ee 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_js.js +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_js.js @@ -1,6 +1,6 @@ -/*global window, rJS, RSVP */ +/*global window, rJS, RSVP, calculatePageTitle */ /*jslint nomen: true, indent: 2, maxerr: 3 */ -(function (window, rJS, RSVP) { +(function (window, rJS, RSVP, calculatePageTitle) { "use strict"; // Precompile the templates while loading the first gadget instance @@ -56,7 +56,8 @@ gadget.getUrlFor({command: 'history_previous'}), gadget.getUrlFor({command: 'selection_previous'}), gadget.getUrlFor({command: 'selection_next'}), - gadget.getUrlFor({command: 'change', options: {page: "tab"}}) + gadget.getUrlFor({command: 'change', options: {page: "tab"}}), + calculatePageTitle(gadget, options.erp5_document) ]); }) .push(function (all_result) { @@ -69,9 +70,9 @@ next_url: all_result[5], tab_url: all_result[6], export_url: "", - page_title: options.erp5_document.title, + page_title: all_result[7] }); }); }); -}(window, rJS, RSVP)); \ No newline at end of file +}(window, rJS, RSVP, calculatePageTitle)); \ No newline at end of file diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_js.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_js.xml index 10266180fa986679870421ccebf4fcb096a85532..06e54a3ecad29d98c4d32ef14003e8f1cd8906e3 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_js.xml +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_js.xml @@ -230,7 +230,7 @@ </item> <item> <key> <string>serial</string> </key> - <value> <string>950.21248.30063.21504</string> </value> + <value> <string>950.28778.3703.7458</string> </value> </item> <item> <key> <string>state</string> </key> @@ -248,7 +248,7 @@ </tuple> <state> <tuple> - <float>1459949849.57</float> + <float>1460380730.43</float> <string>UTC</string> </tuple> </state> diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_jumppage_html.html b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_jumppage_html.html index 256eee61b19f01f7dec118a766d8218241477c3c..7713f164501ac8c53d88bb4b9621af43bddefd68 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_jumppage_html.html +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_jumppage_html.html @@ -13,6 +13,7 @@ <!-- custom script --> <script src="gadget_global.js" type="text/javascript"></script> + <script src="gadget_erp5_global.js" type="text/javascript"></script> <script src="gadget_erp5_page_jump.js" type="text/javascript"></script> <!-- XXX need theme here currently --> diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_jumppage_html.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_jumppage_html.xml index 08b95f99ca126f560f1341a93c8204744c119019..aa638e34e768db0fde6e8e5fb8084db94c72d367 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_jumppage_html.xml +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_jumppage_html.xml @@ -234,7 +234,7 @@ </item> <item> <key> <string>serial</string> </key> - <value> <string>949.63827.42318.23261</string> </value> + <value> <string>950.21248.30063.21504</string> </value> </item> <item> <key> <string>state</string> </key> @@ -252,7 +252,7 @@ </tuple> <state> <tuple> - <float>1458556447.37</float> + <float>1460379569.95</float> <string>UTC</string> </tuple> </state> diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_jumppage_js.js b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_jumppage_js.js index 79863c09428d727384479f17f1f13453cef1ae31..2a679c847d74c34138adee251183ac17306fa0a4 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_jumppage_js.js +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_jumppage_js.js @@ -1,6 +1,6 @@ -/*global window, rJS, RSVP, Handlebars, URI */ +/*global window, rJS, RSVP, Handlebars, URI, calculatePageTitle */ /*jslint nomen: true, indent: 2, maxerr: 3 */ -(function (window, rJS, RSVP, Handlebars, URI) { +(function (window, rJS, RSVP, Handlebars, URI, calculatePageTitle) { "use strict"; ///////////////////////////////////////////////////////////////// @@ -81,20 +81,23 @@ i18n: view_list[i - 1].title }); } - return gadget.translateHtml(table_template({ - definition_title: "Jumps", - documentlist: tab_list, - definition_i18n: "Jumps" - })); + return RSVP.all([ + gadget.translateHtml(table_template({ + definition_title: "Jumps", + documentlist: tab_list, + definition_i18n: "Jumps" + })), + calculatePageTitle(gadget, erp5_document) + ]); }) - .push(function (my_translated_html) { - gadget.props.element.innerHTML = my_translated_html; + .push(function (last_result_list) { + gadget.props.element.innerHTML = last_result_list[0]; return gadget.updateHeader({ back_url: result_list[0], - page_title: erp5_document.title + page_title: last_result_list[1] }); }); }); -}(window, rJS, RSVP, Handlebars, URI)); \ No newline at end of file +}(window, rJS, RSVP, Handlebars, URI, calculatePageTitle)); \ No newline at end of file diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_jumppage_js.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_jumppage_js.xml index d38160eade9e8cc7ed940311f509f34438df46e8..d8536818e87f9dd17a385e3248ddacaaa5b92de5 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_jumppage_js.xml +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_jumppage_js.xml @@ -230,7 +230,7 @@ </item> <item> <key> <string>serial</string> </key> - <value> <string>950.21615.60122.32938</string> </value> + <value> <string>950.28780.17945.40857</string> </value> </item> <item> <key> <string>state</string> </key> @@ -248,7 +248,7 @@ </tuple> <state> <tuple> - <float>1459950664.05</float> + <float>1460380844.66</float> <string>UTC</string> </tuple> </state> diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_report_view_js.js b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_report_view_js.js index f85de4a0541e157f701a36a27b3f7111b538ec13..07aca99f4f9a34e566f91aeda74f8756aad85f07 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_report_view_js.js +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_report_view_js.js @@ -24,6 +24,12 @@ var erp5_document = { '_embedded': { '_view': report_section + }, + '_links': { + 'type': { + // form_view display portal_type in header + name: '' + } } }; return form_gadget.render({erp5_document: erp5_document, diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_report_view_js.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_report_view_js.xml index 256d4637e9bb4b37cac785b1b1ad6e6fa7318af8..88d100fc4db19d17b41001a37ceb237a81779126 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_report_view_js.xml +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_report_view_js.xml @@ -230,7 +230,7 @@ </item> <item> <key> <string>serial</string> </key> - <value> <string>949.56908.44233.60842</string> </value> + <value> <string>950.28705.60351.34013</string> </value> </item> <item> <key> <string>state</string> </key> @@ -248,7 +248,7 @@ </tuple> <state> <tuple> - <float>1458135172.43</float> + <float>1460375525.08</float> <string>UTC</string> </tuple> </state> diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_tabpage_html.html b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_tabpage_html.html index 25ff4f2931f417110540b0b99766253935b0ce2f..1328449419c7fb12700d4a7d027de0bc508f461b 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_tabpage_html.html +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_tabpage_html.html @@ -13,6 +13,7 @@ <!-- custom script --> <script src="gadget_global.js" type="text/javascript"></script> + <script src="gadget_erp5_global.js" type="text/javascript"></script> <script src="gadget_erp5_page_tab.js" type="text/javascript"></script> <script id="table-template" type="text/x-handlebars-template"> diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_tabpage_html.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_tabpage_html.xml index be3c870d93813c71e682370170640bb4121c4de5..e5ccbf29eb4322165d74cc349e2a3c9f8b713f56 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_tabpage_html.xml +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_tabpage_html.xml @@ -220,7 +220,7 @@ </item> <item> <key> <string>actor</string> </key> - <value> <string>super_sven</string> </value> + <value> <string>zope</string> </value> </item> <item> <key> <string>comment</string> </key> @@ -234,7 +234,7 @@ </item> <item> <key> <string>serial</string> </key> - <value> <string>939.51485.40506.26299</string> </value> + <value> <string>946.44927.40202.16725</string> </value> </item> <item> <key> <string>state</string> </key> @@ -252,8 +252,8 @@ </tuple> <state> <tuple> - <float>1419930446.08</float> - <string>GMT</string> + <float>1460379644.0</float> + <string>UTC</string> </tuple> </state> </object> diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_tabpage_js.js b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_tabpage_js.js index 45b5b90aee7755d4a5403c3313c1eca933f98073..cea3a06b2398bd84673fbbd3fa5f0ab89e480f05 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_tabpage_js.js +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_tabpage_js.js @@ -1,6 +1,6 @@ -/*global window, rJS, RSVP, Handlebars, URI */ +/*global window, rJS, RSVP, Handlebars, URI, calculatePageTitle */ /*jslint nomen: true, indent: 2, maxerr: 3 */ -(function (window, rJS, RSVP, Handlebars, URI) { +(function (window, rJS, RSVP, Handlebars, URI, calculatePageTitle) { "use strict"; ///////////////////////////////////////////////////////////////// @@ -174,15 +174,16 @@ return RSVP.all([ gadget.getUrlFor({command: 'change', options: { page: undefined - }}) + }}), + calculatePageTitle(gadget, erp5_document) ]); }) .push(function (url_list) { return gadget.updateHeader({ back_url: url_list[0], - page_title: erp5_document.title + page_title: url_list[1] }); }); }); -}(window, rJS, RSVP, Handlebars, URI)); \ No newline at end of file +}(window, rJS, RSVP, Handlebars, URI, calculatePageTitle)); \ No newline at end of file diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_tabpage_js.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_tabpage_js.xml index dd48d91b5d9b4cfbfdb58479ad3953b6384e9907..fed8a88775eb2f35d8d85269d9d42b06433cf6aa 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_tabpage_js.xml +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_tabpage_js.xml @@ -230,7 +230,7 @@ </item> <item> <key> <string>serial</string> </key> - <value> <string>950.21620.43393.65211</string> </value> + <value> <string>950.28781.23028.58368</string> </value> </item> <item> <key> <string>state</string> </key> @@ -248,7 +248,7 @@ </tuple> <state> <tuple> - <float>1460022847.5</float> + <float>1460380878.05</float> <string>UTC</string> </tuple> </state> diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_serviceworker.js b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_serviceworker.js index 45127a8923b3c63fb7a58b205c1a153fbddba8e2..651afe04336ae6ba15d50669e16b91c65b646fc9 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_serviceworker.js +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_serviceworker.js @@ -3,7 +3,7 @@ (function (self, caches, fetch) { "use strict"; - var CACHE_NAME = 'Mon, 07 Apr 2016 08:35:00 GMT', + var CACHE_NAME = 'Mon, 11 Apr 2016 14:30:00 GMT', // Files required to make this app work offline REQUIRED_FILES = [ './', @@ -106,6 +106,7 @@ 'gadget_erp5_sort_editor.html', 'gadget_erp5_sort_editor.js', 'gadget_global.js', + 'gadget_erp5_global.js', 'gadget_jio.html', 'gadget_jio.js', 'gadget_translation.html', diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_serviceworker.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_serviceworker.xml index b272372faba322a562c475157bba08921397fdb9..de9a89b97e9791fc01182499472e248a227433aa 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_serviceworker.xml +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_serviceworker.xml @@ -230,7 +230,7 @@ </item> <item> <key> <string>serial</string> </key> - <value> <string>950.21248.30063.21504</string> </value> + <value> <string>950.28810.53400.136</string> </value> </item> <item> <key> <string>state</string> </key> @@ -248,7 +248,7 @@ </tuple> <state> <tuple> - <float>1460023897.57</float> + <float>1460381462.83</float> <string>UTC</string> </tuple> </state> diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testEditNotIndexedDocument.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testEditNotIndexedDocument.zpt index 613f268cbf145a3c408fa3f370ef90d67fd1db47..c886c2c9c99cae5c1ea473f5779a5ac1680628a7 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testEditNotIndexedDocument.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testEditNotIndexedDocument.zpt @@ -105,7 +105,7 @@ <tr> <td>click</td> - <td>//a[text()='1']</td> + <td>//a[text()='Foo Line: 1']</td> <td></td> </tr> diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testFilterWithPreviousNext.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testFilterWithPreviousNext.zpt index ff4251c4920174e7e43de202f6cfa78888d6062e..e00a6445b3c7ab2d56d77f056a3c25ac39a16d96 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testFilterWithPreviousNext.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testFilterWithPreviousNext.zpt @@ -175,7 +175,7 @@ <tr> <td>waitForElementPresent</td> - <td>//a[@data-i18n='Foos']</td> + <td>//a[@data-i18n='Foo Module']</td> <td></td> </tr> diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testListboxInNoEditableMode.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testListboxInNoEditableMode.zpt index e7c78cb32048eddcd70d97b3037477c336f07bdf..3b2cf54e8217cd6496975168a4e417ab6949b078 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testListboxInNoEditableMode.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testListboxInNoEditableMode.zpt @@ -105,7 +105,7 @@ <tr> <td>click</td> - <td>//a[text()='1']</td> + <td>//a[text()='Foo Line: 1']</td> <td></td> </tr> diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSortWithPreviousNext.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSortWithPreviousNext.zpt index 125d357d3add46a3a9f2d3d89f6213aed92546fe..a77c6b61c6cf7a5ee815be0e2a401336f2826a15 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSortWithPreviousNext.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSortWithPreviousNext.zpt @@ -139,7 +139,7 @@ <tr> <td>waitForElementNotPresent</td> - <td>//a[@data-i18n = "Title 2"]</td> + <td>//a[@data-i18n = "Foo: Title 2"]</td> <td></td> </tr> @@ -147,7 +147,7 @@ <tr> <td>waitForElementPresent</td> - <td>//a[@data-i18n='Title 3']</td> + <td>//a[@data-i18n='Foo: Title 3']</td> <td></td> </tr> @@ -167,14 +167,14 @@ <tr> <td>waitForElementNotPresent</td> - <td>//a[@data-i18n = "Title 3"]</td> + <td>//a[@data-i18n = "Foo: Title 3"]</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//a[@data-i18n='Title 4']</td> + <td>//a[@data-i18n='Foo: Title 4']</td> <td></td> </tr> @@ -195,13 +195,13 @@ <tr> <td>waitForElementNotPresent</td> - <td>//a[@data-i18n = "Title 4"]</td> + <td>//a[@data-i18n = "Foo: Title 4"]</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//a[@data-i18n='Title 3']</td> + <td>//a[@data-i18n='Foo: Title 3']</td> <td></td> </tr> diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormDialogCancelLink.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormDialogCancelLink.zpt index 377e442c4349008555663903d35066aa828609f9..f2e92945fffcdd0e963629d82f1c4798be9ce55c 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormDialogCancelLink.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormDialogCancelLink.zpt @@ -42,19 +42,19 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@data-gadget-scope='header']//a[text()='Title 1' and contains(@href, '#!change') and contains(@href, 'u.page=') and contains(@href, 'u.view=')]</td> + <td>//div[@data-gadget-scope='header']//a[text()='Foo: Title 1' and contains(@href, '#!change') and contains(@href, 'u.page=') and contains(@href, 'u.view=')]</td> <td></td> </tr> <!-- Header has a link to the previous history entry --> <tr> <td>assertElementPresent</td> - <td>//div[@data-gadget-scope='header']//a[text()='Title 1' and contains(@href, '#!change') and contains(@href, 'u.page=') and contains(@href, 'u.view=')]</td> + <td>//div[@data-gadget-scope='header']//a[text()='Foo: Title 1' and contains(@href, '#!change') and contains(@href, 'u.page=') and contains(@href, 'u.view=')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@data-gadget-scope='header']//a[text()='Title 1' and contains(@href, '#!change') and contains(@href, 'u.page=') and contains(@href, 'u.view=')]</td> + <td>//div[@data-gadget-scope='header']//a[text()='Foo: Title 1' and contains(@href, '#!change') and contains(@href, 'u.page=') and contains(@href, 'u.view=')]</td> <td></td> </tr> <tr> diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormDialogCancelLinkOnModule.xml b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormDialogCancelLinkOnModule.xml new file mode 100644 index 0000000000000000000000000000000000000000..a44dcf6d6f59bdc4cfc41f933a5900ed20c6a976 --- /dev/null +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormDialogCancelLinkOnModule.xml @@ -0,0 +1,58 @@ +<?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>testFormDialogCancelLinkOnModule</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> diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormDialogCancelLinkOnModule.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormDialogCancelLinkOnModule.zpt new file mode 100644 index 0000000000000000000000000000000000000000..dcc4a3f1e04279fa9ce480a05c3a3372c99ac7fe --- /dev/null +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormDialogCancelLinkOnModule.zpt @@ -0,0 +1,68 @@ +<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 Form View Editable Back Link</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">Test Default Module View</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</td> + <td></td> +</tr> + +<!-- Wait for gadget to be loaded --> +<tr> + <td>waitForElementPresent</td> + <td>//div[@data-gadget-url='${base_url}/web_site_module/renderjs_runner/gadget_erp5_pt_form_list.html']</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>Foo Module</td> + <td></td> +</tr> + +<!-- Go to the new content dialog --> +<tr> + <td>click</td> + <td>//div[@data-gadget-scope='header']//a[text()='Add' and contains(@href, '#!change') and contains(@href, 'view%3Dcreate_a_document')]</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@data-gadget-url='${base_url}/web_site_module/renderjs_runner/gadget_erp5_pt_form_dialog.html']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@data-gadget-scope='header']//a[text()='Foo Module' and contains(@href, '#!change') and contains(@href, 'u.page=') and contains(@href, 'u.view=')]</td> + <td></td> +</tr> + +<!-- Header has a link to the previous history entry --> +<tr> + <td>assertElementPresent</td> + <td>//div[@data-gadget-scope='header']//a[text()='Foo Module' and contains(@href, '#!change') and contains(@href, 'u.page=') and contains(@href, 'u.view=')]</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@data-gadget-scope='header']//a[text()='Foo Module' and contains(@href, '#!change') and contains(@href, 'u.page=') and contains(@href, 'u.view=')]</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@data-gadget-url='${base_url}/web_site_module/renderjs_runner/gadget_erp5_pt_form_list.html']</td> + <td></td> +</tr> + +</tbody></table> +</body> +</html> \ No newline at end of file diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormListFrontLink.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormListFrontLink.zpt index 5fd553e9776ba44a82af37a91b00ca4e5503b78d..f732d57f6e0032c5c58ab1cdb5a74022bceb0d8f 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormListFrontLink.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormListFrontLink.zpt @@ -32,12 +32,12 @@ <!-- Header has a link to the front page --> <tr> <td>assertElementPresent</td> - <td>//div[@data-gadget-scope='header']//a[text()='Foos' and contains(@href, '#!display')]</td> + <td>//div[@data-gadget-scope='header']//a[text()='Foo Module' and contains(@href, '#!display')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@data-gadget-scope='header']//a[text()='Foos' and contains(@href, '#!display')]</td> + <td>//div[@data-gadget-scope='header']//a[text()='Foo Module' and contains(@href, '#!display')]</td> <td></td> </tr> <tr> diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormViewBackLink.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormViewBackLink.zpt index df4c1e7c504410ca62b80fb157f65486c5b13fa4..1570ab768e3e4ee9240453cba0706a99b666876a 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormViewBackLink.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormViewBackLink.zpt @@ -32,12 +32,12 @@ <!-- Header has a link to the previous history entry --> <tr> <td>assertElementPresent</td> - <td>//div[@data-gadget-scope='header']//a[text()='Title 1' and contains(@href, '#!history_previous')]</td> + <td>//div[@data-gadget-scope='header']//a[text()='Foo: Title 1' and contains(@href, '#!history_previous')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@data-gadget-scope='header']//a[text()='Title 1' and contains(@href, '#!history_previous')]</td> + <td>//div[@data-gadget-scope='header']//a[text()='Foo: Title 1' and contains(@href, '#!history_previous')]</td> <td></td> </tr> <tr> diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormViewEditableBackLink.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormViewEditableBackLink.zpt index 4e43a263699b4508c0f561c4519660c126ff9a19..4b382107b5c17bb7951656a9a2f4c2193c49f2fa 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormViewEditableBackLink.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormViewEditableBackLink.zpt @@ -32,12 +32,12 @@ <!-- Header has a link to the previous history entry --> <tr> <td>assertElementPresent</td> - <td>//div[@data-gadget-scope='header']//a[text()='Title 1' and contains(@href, '#!history_previous')]</td> + <td>//div[@data-gadget-scope='header']//a[text()='Foo: Title 1' and contains(@href, '#!history_previous')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@data-gadget-scope='header']//a[text()='Title 1' and contains(@href, '#!history_previous')]</td> + <td>//div[@data-gadget-scope='header']//a[text()='Foo: Title 1' and contains(@href, '#!history_previous')]</td> <td></td> </tr> <tr> diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormViewEditableSaveAction.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormViewEditableSaveAction.zpt index 4dfcd3fa73fd8de01476928415306a7e8a344823..5fac6663dca499449e0add5e50f43bcb22de9f3c 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormViewEditableSaveAction.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormViewEditableSaveAction.zpt @@ -62,7 +62,7 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@data-gadget-scope='header']//a[text()='QWERTY' and contains(@href, '#!history_previous')]</td> + <td>//div[@data-gadget-scope='header']//a[text()='Foo: QWERTY' and contains(@href, '#!history_previous')]</td> <td></td> </tr> <tr> diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormViewEditableSaveActionWithoutPermission.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormViewEditableSaveActionWithoutPermission.zpt index e4ec010d6ed9b589af88c470ea64dde4907acc6b..f87a4892477128c10b67b73ea1877377d4b62291 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormViewEditableSaveActionWithoutPermission.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormViewEditableSaveActionWithoutPermission.zpt @@ -85,7 +85,7 @@ </tr> <tr> <td>assertElementPresent</td> - <td>//div[@data-gadget-scope='header']//a[text()='Title 1' and contains(@href, '#!history_previous')]</td> + <td>//div[@data-gadget-scope='header']//a[text()='Foo: Title 1' and contains(@href, '#!history_previous')]</td> <td></td> </tr> <tr> diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageActionBackLink.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageActionBackLink.zpt index 3f02667298dca01a99e1dcf4ea272c9b30d6b158..c1b00f7ea27a2c409e7fb0f3984bb4c6fd890638 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageActionBackLink.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageActionBackLink.zpt @@ -32,14 +32,14 @@ <!-- Generate back link --> <tr> <td>assertElementPresent</td> - <td>//div[@data-gadget-scope='header']//a[text()='Title 1' and contains(@href, '#!change') and contains(@href, 'u.page=')]</td> + <td>//div[@data-gadget-scope='header']//a[text()='Foo: Title 1' and contains(@href, '#!change') and contains(@href, 'u.page=')]</td> <td></td> </tr> <!-- Follow back link --> <tr> <td>click</td> - <td>//div[@data-gadget-scope='header']//a[text()='Title 1' and contains(@href, '#!change') and contains(@href, 'u.page=')]</td> + <td>//div[@data-gadget-scope='header']//a[text()='Foo: Title 1' and contains(@href, '#!change') and contains(@href, 'u.page=')]</td> <td></td> </tr> <tr> diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageActionBackLinkOnModule.xml b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageActionBackLinkOnModule.xml new file mode 100644 index 0000000000000000000000000000000000000000..c4a6f3c12bcf98d0f80a4a36f22d05ef7f11b0fb --- /dev/null +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageActionBackLinkOnModule.xml @@ -0,0 +1,58 @@ +<?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>testPageActionBackLinkOnModule</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> diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageActionBackLinkOnModule.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageActionBackLinkOnModule.zpt new file mode 100644 index 0000000000000000000000000000000000000000..7e73333df9924df28fb69071448ce1bf30f6f01e --- /dev/null +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageActionBackLinkOnModule.zpt @@ -0,0 +1,58 @@ +<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 Page Front</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">Test Page Action Back List</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?page=action</td> + <td></td> +</tr> + +<!-- Wait for gadget to be loaded --> +<tr> + <td>waitForElementPresent</td> + <td>//div[@data-gadget-url='${base_url}/web_site_module/renderjs_runner/gadget_erp5_page_action.html']</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>Foo Module</td> + <td></td> +</tr> + +<!-- Generate back link --> +<tr> + <td>assertElementPresent</td> + <td>//div[@data-gadget-scope='header']//a[text()='Foo Module' and contains(@href, '#!change') and contains(@href, 'u.page=')]</td> + <td></td> +</tr> + +<!-- Follow back link --> +<tr> + <td>click</td> + <td>//div[@data-gadget-scope='header']//a[text()='Foo Module' and contains(@href, '#!change') and contains(@href, 'u.page=')]</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@data-gadget-url='${base_url}/web_site_module/renderjs_runner/gadget_erp5_pt_form_list.html']</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>Foos</td> + <td></td> +</tr> + +</tbody></table> +</body> +</html> \ No newline at end of file diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageActionBackLinkRedirectToPreviousView.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageActionBackLinkRedirectToPreviousView.zpt index 0291d9717855342af3a7a4ba09220f41aaa35ff1..ab91cbc755a763be9bf81ef873d8bd017ff7e333 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageActionBackLinkRedirectToPreviousView.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageActionBackLinkRedirectToPreviousView.zpt @@ -88,14 +88,14 @@ <!-- Generate back link --> <tr> <td>waitForElementPresent</td> - <td>//div[@data-gadget-scope='header']//a[text()='Title 1' and contains(@href, '#!change') and contains(@href, 'u.page=')]</td> + <td>//div[@data-gadget-scope='header']//a[text()='Foo: Title 1' and contains(@href, '#!change') and contains(@href, 'u.page=')]</td> <td></td> </tr> <!-- Follow back link --> <tr> <td>click</td> - <td>//div[@data-gadget-scope='header']//a[text()='Title 1' and contains(@href, '#!change') and contains(@href, 'u.page=')]</td> + <td>//div[@data-gadget-scope='header']//a[text()='Foo: Title 1' and contains(@href, '#!change') and contains(@href, 'u.page=')]</td> <td></td> </tr> <tr> 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 3ae2098dc99da9a378a0f1c384e0e63b27a0dacb..e0847839e158a912646a79d9b6c1da6ef07ad43c 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 @@ -67,12 +67,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@data-gadget-scope='header']//a[text()='Title 1' and contains(@href, '#!history_previous')]</td> + <td>//div[@data-gadget-scope='header']//a[text()='Foo: Title 1' and contains(@href, '#!history_previous')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@data-gadget-scope='header']//a[text()='Title 1' and contains(@href, '#!history_previous')]</td> + <td>//div[@data-gadget-scope='header']//a[text()='Foo: Title 1' and contains(@href, '#!history_previous')]</td> <td></td> </tr> <tr> @@ -92,12 +92,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@data-gadget-scope='header']//a[text()='Title 2' and contains(@href, '#!history_previous')]</td> + <td>//div[@data-gadget-scope='header']//a[text()='Foo: Title 2' and contains(@href, '#!history_previous')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@data-gadget-scope='header']//a[text()='Title 2' and contains(@href, '#!history_previous')]</td> + <td>//div[@data-gadget-scope='header']//a[text()='Foo: Title 2' and contains(@href, '#!history_previous')]</td> <td></td> </tr> <tr> @@ -155,12 +155,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@data-gadget-scope='header']//a[text()='Title 1' and contains(@href, '#!history_previous')]</td> + <td>//div[@data-gadget-scope='header']//a[text()='Foo: Title 1' and contains(@href, '#!history_previous')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@data-gadget-scope='header']//a[text()='Title 1' and contains(@href, '#!history_previous')]</td> + <td>//div[@data-gadget-scope='header']//a[text()='Foo: Title 1' and contains(@href, '#!history_previous')]</td> <td></td> </tr> <tr> diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageTabBackLink.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageTabBackLink.zpt index 7b92324c115bf2d77bcdcd06bf1efab5e6840fa8..4dfa71fa48e7f1b0ab3015701c7111322835d5df 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageTabBackLink.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageTabBackLink.zpt @@ -32,14 +32,14 @@ <!-- Generate back link --> <tr> <td>assertElementPresent</td> - <td>//div[@data-gadget-scope='header']//a[text()='Title 1' and contains(@href, '#!change') and contains(@href, 'u.page=')]</td> + <td>//div[@data-gadget-scope='header']//a[text()='Foo: Title 1' and contains(@href, '#!change') and contains(@href, 'u.page=')]</td> <td></td> </tr> <!-- Follow back link --> <tr> <td>click</td> - <td>//div[@data-gadget-scope='header']//a[text()='Title 1' and contains(@href, '#!change') and contains(@href, 'u.page=')]</td> + <td>//div[@data-gadget-scope='header']//a[text()='Foo: Title 1' and contains(@href, '#!change') and contains(@href, 'u.page=')]</td> <td></td> </tr> <tr> diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageTabBackLinkRedirectToPreviousView.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageTabBackLinkRedirectToPreviousView.zpt index 8d719dd060adf3a1259276d1bc6df4a7351e37c4..dc606812f4c304c779ce0bb9144c3569eb704aaa 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageTabBackLinkRedirectToPreviousView.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageTabBackLinkRedirectToPreviousView.zpt @@ -88,14 +88,14 @@ <!-- Generate back link --> <tr> <td>waitForElementPresent</td> - <td>//div[@data-gadget-scope='header']//a[text()='Title 1' and contains(@href, '#!change') and contains(@href, 'u.page=')]</td> + <td>//div[@data-gadget-scope='header']//a[text()='Foo: Title 1' and contains(@href, '#!change') and contains(@href, 'u.page=')]</td> <td></td> </tr> <!-- Follow back link --> <tr> <td>click</td> - <td>//div[@data-gadget-scope='header']//a[text()='Title 1' and contains(@href, '#!change') and contains(@href, 'u.page=')]</td> + <td>//div[@data-gadget-scope='header']//a[text()='Foo: Title 1' and contains(@href, '#!change') and contains(@href, 'u.page=')]</td> <td></td> </tr> <tr> diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_router_zuite/testCommandHistoryPreviousJumpToPreviousContext.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_router_zuite/testCommandHistoryPreviousJumpToPreviousContext.zpt index 6acb64d5dd9076143b39f34999959bcf3bae0de5..0d5709f6b6671dcd7fd598974ae20719e8e2537b 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_router_zuite/testCommandHistoryPreviousJumpToPreviousContext.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_router_zuite/testCommandHistoryPreviousJumpToPreviousContext.zpt @@ -127,12 +127,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@data-gadget-scope='header']//a[text()='1' and contains(@href, '#!history_previous')]</td> + <td>//div[@data-gadget-scope='header']//a[text()='Foo Line: 1' and contains(@href, '#!history_previous')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@data-gadget-scope='header']//a[text()='1' and contains(@href, '#!history_previous')]</td> + <td>//div[@data-gadget-scope='header']//a[text()='Foo Line: 1' and contains(@href, '#!history_previous')]</td> <td></td> </tr> @@ -149,12 +149,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@data-gadget-scope='header']//a[text()='Title 1' and contains(@href, '#!history_previous')]</td> + <td>//div[@data-gadget-scope='header']//a[text()='Foo: Title 1' and contains(@href, '#!history_previous')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@data-gadget-scope='header']//a[text()='Title 1' and contains(@href, '#!history_previous')]</td> + <td>//div[@data-gadget-scope='header']//a[text()='Foo: Title 1' and contains(@href, '#!history_previous')]</td> <td></td> </tr> diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_router_zuite/testCommandHistoryPreviousUnknownHistory.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_router_zuite/testCommandHistoryPreviousUnknownHistory.zpt index 3090af50df07f92f47b568c986cda447d0788dcd..1283b3134107317415073473eda67b31758efdd2 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_router_zuite/testCommandHistoryPreviousUnknownHistory.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_router_zuite/testCommandHistoryPreviousUnknownHistory.zpt @@ -32,12 +32,12 @@ <!-- Header has a link to the previous history --> <tr> <td>assertElementPresent</td> - <td>//div[@data-gadget-scope='header']//a[text()='Title 1' and contains(@href, '#!history_previous')]</td> + <td>//div[@data-gadget-scope='header']//a[text()='Foo: Title 1' and contains(@href, '#!history_previous')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@data-gadget-scope='header']//a[text()='Title 1' and contains(@href, '#!history_previous')]</td> + <td>//div[@data-gadget-scope='header']//a[text()='Foo: Title 1' and contains(@href, '#!history_previous')]</td> <td></td> </tr> <tr> diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_router_zuite/testCommandHistoryPreviousWithoutHistory.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_router_zuite/testCommandHistoryPreviousWithoutHistory.zpt index b408505debc18c6be8b880d591efbd9dbe4e64e2..e862327f4ac61151d0d4646b10b53abe3e5b2fbd 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_router_zuite/testCommandHistoryPreviousWithoutHistory.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_router_zuite/testCommandHistoryPreviousWithoutHistory.zpt @@ -32,12 +32,12 @@ <!-- Header has a link to the previous history --> <tr> <td>assertElementPresent</td> - <td>//div[@data-gadget-scope='header']//a[text()='Title 1' and contains(@href, '#!history_previous')]</td> + <td>//div[@data-gadget-scope='header']//a[text()='Foo: Title 1' and contains(@href, '#!history_previous')]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@data-gadget-scope='header']//a[text()='Title 1' and contains(@href, '#!history_previous')]</td> + <td>//div[@data-gadget-scope='header']//a[text()='Foo: Title 1' and contains(@href, '#!history_previous')]</td> <td></td> </tr> <tr> diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_zuite/relationfield_zuite/testRelationField.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_zuite/relationfield_zuite/testRelationField.zpt index 9a27563a0be3c6d1e706dbe78a05454942fd63ae..5f1cfb631b081c535bfa6e8e49e3be332c985fd1 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_zuite/relationfield_zuite/testRelationField.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_zuite/relationfield_zuite/testRelationField.zpt @@ -66,7 +66,7 @@ </tr> <tr> <td>click</td> - <td>link=2</td> + <td>link=Foo: 2</td> <td></td> </tr> <tr> diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_zuite/testCloneDocument.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_zuite/testCloneDocument.zpt index 8b1dbf124cf4669a81addb4fb8e03f4c806ae7d2..fd44e9845717788ff951e1e3a68fcc9600850e24 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_zuite/testCloneDocument.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_zuite/testCloneDocument.zpt @@ -108,7 +108,7 @@ <tr> <td>click</td> - <td>//a[text()='1']</td> + <td>//a[text()='Foo Line: 1']</td> <td></td> </tr> diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_zuite/testDeleteDocument.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_zuite/testDeleteDocument.zpt index 05aae22717846b9b11e6306ef99fbcce36adae85..89887cf9f6431e24a65f70865d96263899af69d5 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_zuite/testDeleteDocument.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_zuite/testDeleteDocument.zpt @@ -117,13 +117,13 @@ <tr> <td>waitForElementPresent</td> - <td>//a[text()='1']</td> + <td>//a[text()='Foo Line: 1']</td> <td></td> </tr> <tr> <td>click</td> - <td>//a[text()='1']</td> + <td>//a[text()='Foo Line: 1']</td> <td></td> </tr> @@ -174,7 +174,7 @@ <tr> <td>waitForElementPresent</td> - <td>//a[text()='2']</td> + <td>//a[text()='Foo Line: 2']</td> <td></td> </tr> @@ -196,13 +196,13 @@ <tr> <td>waitForElementPresent</td> - <td>//a[text()='2']</td> + <td>//a[text()='Foo Line: 2']</td> <td></td> </tr> <tr> <td>click</td> - <td>//a[text()='2']</td> + <td>//a[text()='Foo Line: 2']</td> <td></td> </tr>