projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
6ab74d0
)
[MERGE] [FIX] one2many fields: when sortign on a column of type m2o (format (id,...
author
Martin Trigaux
<mat@openerp.com>
Wed, 12 Mar 2014 15:04:35 +0000
(16:04 +0100)
committer
Martin Trigaux
<mat@openerp.com>
Wed, 12 Mar 2014 15:04:35 +0000
(16:04 +0100)
bzr revid: mat@openerp.com-
20140312150435
-shq9hy3b9njkhxsn
addons/web/static/src/js/data.js
patch
|
blob
|
history
diff --git
a/addons/web/static/src/js/data.js
b/addons/web/static/src/js/data.js
index
04b0229
..
ee24c48
100644
(file)
--- a/
addons/web/static/src/js/data.js
+++ b/
addons/web/static/src/js/data.js
@@
-880,6
+880,10
@@
instance.web.BufferedDataSet = instance.web.DataSetStatic.extend({
sign = -1;
field = field.slice(1);
}
+ //m2o should be searched based on value[1] not based whole value(i.e. [id, value])
+ if(_.isArray(a[field]) && a[field].length == 2 && _.isString(a[field][1])){
+ return sign * compare(a[field][1], b[field][1]);
+ }
return sign * compare(a[field], b[field]);
}, 0);
});