Commit beb0bfa9 authored by Xiaowu Zhang's avatar Xiaowu Zhang

erp5_web_renderjs_ui: display all lines for listbox configured with a 'lines' value to 0

parent 62968e03
...@@ -409,6 +409,7 @@ ...@@ -409,6 +409,7 @@
select_list = [],\n select_list = [],\n
dataset,\n dataset,\n
counter,\n counter,\n
limit_options,\n
queue,\n queue,\n
i;\n i;\n
\n \n
...@@ -433,11 +434,16 @@ ...@@ -433,11 +434,16 @@
select_list.push(field_json.column_list[i][0]);\n select_list.push(field_json.column_list[i][0]);\n
}\n }\n
select_list.push("uid");\n select_list.push("uid");\n
if (lines === 0) {\n
limit_options = undefined;\n
} else {\n
limit_options = [begin_from, lines + 1];\n
}\n
queue = gadget.jio_allDocs({\n queue = gadget.jio_allDocs({\n
// XXX Not jIO compatible, but until a better api is found...\n // XXX Not jIO compatible, but until a better api is found...\n
"list_method_template": field_json.list_method_template,\n "list_method_template": field_json.list_method_template,\n
"query": query_string,\n "query": query_string,\n
"limit": [begin_from, lines + 1],\n "limit": limit_options,\n
"select_list": select_list,\n "select_list": select_list,\n
"sort_on": gadget.props.sort_list\n "sort_on": gadget.props.sort_list\n
});\n });\n
...@@ -454,7 +460,12 @@ ...@@ -454,7 +460,12 @@
})\n })\n
.push(function (result) {\n .push(function (result) {\n
var promise_list = [result];\n var promise_list = [result];\n
counter = Math.min(result.data.total_rows, lines);\n if (lines === 0) {\n
lines = result.data.total_rows;\n
counter = result.data.total_rows;\n
} else {\n
counter = Math.min(result.data.total_rows, lines);\n
}\n
for (i = 0; i < counter; i += 1) {\n for (i = 0; i < counter; i += 1) {\n
promise_list.push(\n promise_list.push(\n
gadget.getUrlFor({\n gadget.getUrlFor({\n
...@@ -829,7 +840,7 @@ ...@@ -829,7 +840,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>949.2121.3637.17544</string> </value> <value> <string>949.3576.234.9489</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -847,7 +858,7 @@ ...@@ -847,7 +858,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1455022186.29</float> <float>1455109014.98</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment