From b5a0e5de0ec6958e680bccfb486574c35c0b2071 Mon Sep 17 00:00:00 2001
From: Romain Courteaud <romain@nexedi.com>
Date: Wed, 5 Oct 2016 10:13:57 +0000
Subject: [PATCH] [erp5_web_renderjs_ui] Redirecting is not blocking anymore
---
.../web_page_module/rjs_gadget_erp5_router_js.js | 12 +++++-------
.../web_page_module/rjs_gadget_erp5_router_js.xml | 4 ++--
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.js b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.js
index 19e55c58fd..8d335ea92a 100644
--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.js
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.js
@@ -494,7 +494,11 @@
return gadget.props.jio_gadget.get(history.options_id);
})
.push(function (result) {
- return [result, previous_id];
+ var result_list = [result, previous_id];
+ var options = result_list[0].data,
+ next_jio_key = options.jio_key;
+ delete options.jio_key;
+ return addNavigationHistoryAndDisplay(gadget, next_jio_key, options);
}, function (error) {
// XXX Check if 404
if ((error instanceof jIO.util.jIOError) &&
@@ -503,12 +507,6 @@
// return [{data: {}}, undefined];
}
throw error;
- })
- .push(function (result_list) {
- var options = result_list[0].data,
- next_jio_key = options.jio_key;
- delete options.jio_key;
- return addNavigationHistoryAndDisplay(gadget, next_jio_key, options);
});
return queue;
}
diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.xml
index 48be2277de..b75963c8b0 100644
--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.xml
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.xml
@@ -232,7 +232,7 @@
</item>
<item>
<key> <string>serial</string> </key>
- <value> <string>954.23085.57259.2628</string> </value>
+ <value> <string>954.23087.8752.52155</string> </value>
</item>
<item>
<key> <string>state</string> </key>
@@ -250,7 +250,7 @@
</tuple>
<state>
<tuple>
- <float>1475507467.96</float>
+ <float>1475662389.14</float>
<string>UTC</string>
</tuple>
</state>
--
2.30.9