Techsystech
/
web
mirror of https://github.com/OCA/web.git
3
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Fix issue when query result not in the same order as values

pull/209/merge
David Coninckx 2015-03-30 16:38:18 +02:00 committed by Yannick Vaucher
parent f6070e7cf1
commit d6ba0a680a
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
web_m2x_options/static/src/js/form.js
View File

@ -116,10 +116,17 @@ openerp.web_m2x_options = function (instance) {
.filter([['id', 'in', value_ids]])
.all().done(function (objects) {
for (var index in objects) {
var value = values[index];
// Find color with field value as key
var color = self.colors[objects[index][self.field_color]] || 'black';
value.label = '<span style="color:'+color+'">'+value.label+'</span>';
for (var index_value in values) {
if (values[index_value].id == objects[index].id) {
// Find value in values by comparing ids
var value = values[index_value];
// Find color with field value as key
var color = self.colors[objects[index][self.field_color]] || 'black';
value.label = '<span style="color:'+color+'">'+value.label+'</span>';
break;
}
}
}
def.resolve(values);
});