Commit 13b0594c authored by Romain Courteaud's avatar Romain Courteaud

Merge branch 'master' into 'master'

Master



See merge request !3
parents 391e48d5 737885e3
...@@ -9075,7 +9075,8 @@ Query.searchTextToRegExp = searchTextToRegExp; ...@@ -9075,7 +9075,8 @@ Query.searchTextToRegExp = searchTextToRegExp;
ERP5Storage.prototype.hasCapacity = function (name) { ERP5Storage.prototype.hasCapacity = function (name) {
return ((name === "list") || (name === "query") || return ((name === "list") || (name === "query") ||
(name === "select") || (name === "limit")); (name === "select") || (name === "limit") ||
(name === "sort"));
}; };
ERP5Storage.prototype.buildQuery = function (options) { ERP5Storage.prototype.buildQuery = function (options) {
...@@ -9093,7 +9094,8 @@ Query.searchTextToRegExp = searchTextToRegExp; ...@@ -9093,7 +9094,8 @@ Query.searchTextToRegExp = searchTextToRegExp;
query: options.query, query: options.query,
// XXX Force erp5 to return embedded document // XXX Force erp5 to return embedded document
select_list: options.select_list || ["title", "reference"], select_list: options.select_list || ["title", "reference"],
limit: options.limit limit: options.limit,
sort_on: options.sort_on
}), }),
"xhrFields": { "xhrFields": {
withCredentials: true withCredentials: true
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
{ {
"name": "jio", "name": "jio",
"version": "v3.4.0", "version": "v3.4.1",
"license": "LGPLv3", "license": "LGPLv3",
"author": "Nexedi SA", "author": "Nexedi SA",
"contributors": [ "contributors": [
......
...@@ -394,7 +394,8 @@ ...@@ -394,7 +394,8 @@
ERP5Storage.prototype.hasCapacity = function (name) { ERP5Storage.prototype.hasCapacity = function (name) {
return ((name === "list") || (name === "query") || return ((name === "list") || (name === "query") ||
(name === "select") || (name === "limit")); (name === "select") || (name === "limit") ||
(name === "sort"));
}; };
ERP5Storage.prototype.buildQuery = function (options) { ERP5Storage.prototype.buildQuery = function (options) {
...@@ -412,7 +413,8 @@ ...@@ -412,7 +413,8 @@
query: options.query, query: options.query,
// XXX Force erp5 to return embedded document // XXX Force erp5 to return embedded document
select_list: options.select_list || ["title", "reference"], select_list: options.select_list || ["title", "reference"],
limit: options.limit limit: options.limit,
sort_on: options.sort_on
}), }),
"xhrFields": { "xhrFields": {
withCredentials: true withCredentials: true
......
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