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 935684b63065c52c60891dd5bd7beac476a49d36..c966885b30b3865261729f80c3b29d76d382d6bb 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 @@ -115,6 +115,7 @@ <!-- renderjs -->\n <script src="RSVP.js" type="text/javascript"></script>\n <script src="renderjs.js" type="text/javascript"></script>\n + <script src="URI.js" type="text/javascript"></script>\n \n <!-- custom script -->\n <script src="gadget_global.js" type="text/javascript"></script>\n @@ -270,7 +271,7 @@ </item> <item> <key> <string>serial</string> </key> - <value> <string>936.43174.43766.55927</string> </value> + <value> <string>936.43469.1612.61132</string> </value> </item> <item> <key> <string>state</string> </key> @@ -288,7 +289,7 @@ </tuple> <state> <tuple> - <float>1407143862.28</float> + <float>1407333743.03</float> <string>GMT</string> </tuple> </state> 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 2e63f31d6263c19392f1637b470083b160075316..1747b43919e93773b48a1e5d9662154703db358a 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 @@ -138,12 +138,14 @@ .declareAcquiredMethod("jio_ajax", "jio_ajax")\n .declareAcquiredMethod("pleaseRedirectMyHash", "pleaseRedirectMyHash")\n .declareAcquiredMethod("whoWantToDisplayThisPage", "whoWantToDisplayThisPage")\n + .declareAcquiredMethod("whoWantToDisplayThis", "whoWantToDisplayThis")\n \n /////////////////////////////////////////////////////////////////\n // declared methods\n /////////////////////////////////////////////////////////////////\n .declareMethod(\'render\', function (options) {\n var erp5_document = options.erp5_document,\n + form_options = options.erp5_form || {},\n form_gadget = this;\n \n form_gadget.props.id = erp5_document._id;\n @@ -155,8 +157,7 @@ return form_gadget.getDeclaredGadget("erp5_form")\n \n .push(function (erp5_form) {\n - var form_options = options.erp5_form || {},\n - title,\n + var title = options.form_definition.title,\n i,\n view_list = erp5_document._links.action_workflow || [];\n \n @@ -208,8 +209,14 @@ }\n });\n })\n - .push(function (data) {\n - return form_gadget.whoWantToDisplayThisPage({name: "view"});\n + .push(function (evt) {\n + var location = evt.target.getResponseHeader("X-Location");\n + if (location === undefined) {\n + // No redirection, stay on the same document\n + return form_gadget.whoWantToDisplayThisPage({name: "view"});\n + } else {\n + return form_gadget.whoWantToDisplayThis(new URI(location).segment(2));\n + }\n })\n .push(function (url) {\n return form_gadget.pleaseRedirectMyHash(url);\n @@ -362,7 +369,7 @@ </item> <item> <key> <string>serial</string> </key> - <value> <string>936.43426.13885.45516</string> </value> + <value> <string>936.46364.59346.52275</string> </value> </item> <item> <key> <string>state</string> </key> @@ -380,7 +387,7 @@ </tuple> <state> <tuple> - <float>1407158844.19</float> + <float>1407335049.69</float> <string>GMT</string> </tuple> </state> diff --git a/bt5/erp5_web_renderjs_ui/bt/revision b/bt5/erp5_web_renderjs_ui/bt/revision index aaa6442fe902e96a5233b136b973b96a4011fc18..f70d7bba4ae1f07682e0358bd7a2068094fc023b 100644 --- a/bt5/erp5_web_renderjs_ui/bt/revision +++ b/bt5/erp5_web_renderjs_ui/bt/revision @@ -1 +1 @@ -41 \ No newline at end of file +42 \ No newline at end of file