summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js
diff options
context:
space:
mode:
authorMartin Geubelle <mge@odoo.com>2017-05-11 13:58:54 +0200
committerMartin Geubelle <mge@odoo.com>2017-05-11 14:48:35 +0200
commitef643783a5aee2070fc5f3009b5a9a94d8b8c596 (patch)
tree6ab4527e236c3cd8b54ba515b73946377e967886 /addons/web/static/src/js
parent2e69c189b1c0df1fcb7d31d1d8a52ae55f4c3fc7 (diff)
[FIX] web: deal with malformed `default_order`
Even if the `default_order` attribute should be like 'name,id desc,coucou' we want to support the syntax 'name, id desc, coucou' (i.e. with spaces after the comma). The commit also patches the mock server.
Diffstat (limited to 'addons/web/static/src/js')
-rw-r--r--addons/web/static/src/js/services/data_manager.js2
-rw-r--r--addons/web/static/src/js/views/abstract_view.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/addons/web/static/src/js/services/data_manager.js b/addons/web/static/src/js/services/data_manager.js
index cf49dd3aaec..5131db19028 100644
--- a/addons/web/static/src/js/services/data_manager.js
+++ b/addons/web/static/src/js/services/data_manager.js
@@ -312,7 +312,7 @@ return core.Class.extend({
var defaultOrder = innerFieldsView.arch.attrs.default_order;
if (defaultOrder) {
attrs.orderedBy = _.map(defaultOrder.split(','), function (order) {
- order = order.split(' ');
+ order = order.trim().split(' ');
return {name: order[0], asc: order[1] !== 'desc'};
});
}
diff --git a/addons/web/static/src/js/views/abstract_view.js b/addons/web/static/src/js/views/abstract_view.js
index af3e36ad45b..1f91fc7a796 100644
--- a/addons/web/static/src/js/views/abstract_view.js
+++ b/addons/web/static/src/js/views/abstract_view.js
@@ -109,7 +109,7 @@ var AbstractView = Class.extend({
var defaultOrder = viewInfo.arch.attrs.default_order;
if (defaultOrder) {
this.loadParams.orderedBy = _.map(defaultOrder.split(','), function (order) {
- order = order.split(' ');
+ order = order.trim().split(' ');
return {name: order[0], asc: order[1] !== 'desc'};
});
}