From 5f27addcece1838f51b6e2632930940d7a90d071 Mon Sep 17 00:00:00 2001
From: Romain Courteaud <romain@nexedi.com>
Date: Mon, 4 Jun 2018 10:21:40 +0000
Subject: [PATCH] [erp5_web_renderjs_ui] Inform user when he sees sample of
results
---
.../rjs_gadget_erp5_listbox_html.html | 1 +
.../rjs_gadget_erp5_listbox_html.xml | 4 ++--
.../rjs_gadget_erp5_listbox_js.js | 22 +++++++++++++------
.../rjs_gadget_erp5_listbox_js.xml | 4 ++--
4 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_html.html b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_html.html
index ea0f7d3a72..c65c68ff47 100644
--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_html.html
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_html.html
@@ -6,6 +6,7 @@
data-i18n=Records
data-i18n=Hide Rows
data-i18n=Submit
+ data-i18n=sample of
-->
<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width, user-scalable=no" />
diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_html.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_html.xml
index ffc587ac78..83f0f5e3e4 100644
--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_html.xml
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_html.xml
@@ -234,7 +234,7 @@
</item>
<item>
<key> <string>serial</string> </key>
- <value> <string>967.44841.15161.33928</string> </value>
+ <value> <string>967.44852.3400.7082</string> </value>
</item>
<item>
<key> <string>state</string> </key>
@@ -252,7 +252,7 @@
</tuple>
<state>
<tuple>
- <float>1526894643.05</float>
+ <float>1528106932.21</float>
<string>UTC</string>
</tuple>
</state>
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 925577b9fb..1bff267dd8 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
@@ -619,14 +619,18 @@
prev_param[gadget.state.key + '_begin_from'] = gadget.state.begin_from - lines;
setNext();
}
- return gadget.getUrlForList([
- {command: 'change', options: prev_param},
- {command: 'change', options: next_param}
+ return RSVP.all([
+ gadget.translate('sample of'),
+ gadget.getUrlForList([
+ {command: 'change', options: prev_param},
+ {command: 'change', options: next_param}
+ ])
]);
-
})
- .push(function (url_list) {
- var record,
+ .push(function (result_list) {
+ var sample_string = result_list[0],
+ url_list = result_list[1],
+ record,
previous_url = url_list[0],
next_url = url_list[1],
previous_classname = "ui-btn ui-icon-carat-l ui-btn-icon-left responsive ui-first-child",
@@ -641,7 +645,11 @@
} else {
pagination_message = (((gadget.state.begin_from + lines) / lines - 1) * lines + 1) + " - " + (((gadget.state.begin_from + lines) / lines - 1) * lines + counter);
if (allDocs_result.count !== undefined) {
- pagination_message += ' / ' + allDocs_result.count;
+ if ((allDocs_result.count === 1000) && (!gadget.state.show_count)) {
+ pagination_message += ' / ' + sample_string + ' ' + allDocs_result.count;
+ } else {
+ pagination_message += ' / ' + allDocs_result.count;
+ }
}
record = variable.translated_records + " " + pagination_message;
}
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 9041a5bd20..4633361c78 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>967.44855.43962.32563</string> </value>
+ <value> <string>967.65060.33188.22937</string> </value>
</item>
<item>
<key> <string>state</string> </key>
@@ -254,7 +254,7 @@
</tuple>
<state>
<tuple>
- <float>1526894963.13</float>
+ <float>1528107178.27</float>
<string>UTC</string>
</tuple>
</state>
--
2.30.9