From 332c35af0bdaddbd7de605983a44e47935beb2bd Mon Sep 17 00:00:00 2001
From: Romain Courteaud <romain@nexedi.com>
Date: Fri, 19 Jan 2018 13:24:13 +0100
Subject: [PATCH] [erp5_web_renderjs_ui] Cancel listbox line fetching as soon
as possible
---
.../web_page_module/rjs_gadget_erp5_listbox_js.js | 8 +++-----
.../web_page_module/rjs_gadget_erp5_listbox_js.xml | 4 ++--
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_js.js b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_js.js
index 3afb96d053..874c6d5139 100644
--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_js.js
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_js.js
@@ -197,7 +197,9 @@
}
}
- queue = RSVP.Queue();
+ // Cancel previous line rendering to not conflict with the asynchronous render for now
+ gadget.fetchLineContent(true);
+ queue = new RSVP.Queue();
if (!variable.translated_records) {
queue
.push(function () {
@@ -212,10 +214,6 @@
});
}
queue
- .push(function () {
- // Cancel previous line rendering to not conflict with the asynchronous render for now
- return gadget.fetchLineContent(true);
- })
.push(function () {
// XXX Fix in case of multiple listboxes
return RSVP.all([
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 04f0b04491..be9d6c19f7 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>964.57356.13308.65211</string> </value>
+ <value> <string>964.57356.32284.10547</string> </value>
</item>
<item>
<key> <string>state</string> </key>
@@ -254,7 +254,7 @@
</tuple>
<state>
<tuple>
- <float>1516194029.5</float>
+ <float>1516364147.92</float>
<string>UTC</string>
</tuple>
</state>
--
2.30.9