From 2cfd91623aad5310e2307de2f3a59d516fa358a0 Mon Sep 17 00:00:00 2001 From: Romain Courteaud <romain@nexedi.com> Date: Wed, 4 Sep 2019 14:45:22 +0000 Subject: [PATCH] [erp5_web_renderjs_ui] Listbox: cast document pagination information to int --- .../web_page_module/rjs_gadget_erp5_listbox_js.js | 6 ++++-- .../web_page_module/rjs_gadget_erp5_listbox_js.xml | 4 ++-- 2 files changed, 6 insertions(+), 4 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 486bc52ecb..0b9fcf6fa0 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 @@ -1028,7 +1028,8 @@ next_classname = "ui-btn ui-icon-carat-r ui-btn-icon-right responsive ui-last-child", fragment = document.createDocumentFragment(), sub_element, - nav_element = gadget.element.querySelector('nav'); + nav_element = gadget.element.querySelector('nav'), + from_index; if ((gadget.state.begin_from === 0) && (counter === 0)) { record = variable.translated_no_record; @@ -1037,7 +1038,8 @@ record = counter + " " + variable.translated_records; pagination_message = counter; } else { - pagination_message = (((gadget.state.begin_from + lines) / lines - 1) * lines + 1) + " - " + (((gadget.state.begin_from + lines) / lines - 1) * lines + counter); + from_index = Math.round(((gadget.state.begin_from + lines) / lines - 1) * lines); + pagination_message = (from_index + 1) + " - " + (from_index + counter); if (allDocs_result.count !== undefined) { if ((allDocs_result.count === 1000) && (!gadget.state.show_count)) { pagination_message += ' / ' + sample_string + ' ' + allDocs_result.count; 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 4b8ee3e60f..fcdff163bf 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 @@ -234,7 +234,7 @@ </item> <item> <key> <string>serial</string> </key> - <value> <string>977.11616.36565.47718</string> </value> + <value> <string>978.14035.65281.57804</string> </value> </item> <item> <key> <string>state</string> </key> @@ -252,7 +252,7 @@ </tuple> <state> <tuple> - <float>1563530945.78</float> + <float>1567608261.37</float> <string>UTC</string> </tuple> </state> -- 2.30.9