|
@ -12,7 +12,7 @@ openerp.web_m2x_options = function (instance) { |
|
|
'web_m2x_options.create_edit', |
|
|
'web_m2x_options.create_edit', |
|
|
'web_m2x_options.limit',]; |
|
|
'web_m2x_options.limit',]; |
|
|
|
|
|
|
|
|
instance.web.form.FieldMany2One.include({ |
|
|
|
|
|
|
|
|
instance.web.form.FieldMany2One = instance.web.form.FieldMany2One.extend({ |
|
|
|
|
|
|
|
|
start: function() { |
|
|
start: function() { |
|
|
this._super.apply(this, arguments); |
|
|
this._super.apply(this, arguments); |
|
@ -45,7 +45,7 @@ openerp.web_m2x_options = function (instance) { |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
get_search_result: function (search_val) { |
|
|
get_search_result: function (search_val) { |
|
|
|
|
|
|
|
|
|
|
|
var Objects = new instance.web.Model(this.field.relation); |
|
|
var def = $.Deferred(); |
|
|
var def = $.Deferred(); |
|
|
var self = this; |
|
|
var self = this; |
|
|
// add options limit used to change number of selections record
|
|
|
// add options limit used to change number of selections record
|
|
@ -65,7 +65,11 @@ openerp.web_m2x_options = function (instance) { |
|
|
if(typeof this.options.search_more === 'boolean') { |
|
|
if(typeof this.options.search_more === 'boolean') { |
|
|
this.search_more = this.options.search_more |
|
|
this.search_more = this.options.search_more |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// add options field_color and colors to color item(s) depending on field_color value
|
|
|
|
|
|
this.field_color = this.options.field_color |
|
|
|
|
|
this.colors = this.options.colors |
|
|
|
|
|
|
|
|
var dataset = new instance.web.DataSet(this, this.field.relation, |
|
|
var dataset = new instance.web.DataSet(this, this.field.relation, |
|
|
self.build_context()); |
|
|
self.build_context()); |
|
|
var blacklist = this.get_search_blacklist(); |
|
|
var blacklist = this.get_search_blacklist(); |
|
@ -102,6 +106,28 @@ openerp.web_m2x_options = function (instance) { |
|
|
id: x[0], |
|
|
id: x[0], |
|
|
}; |
|
|
}; |
|
|
}); |
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
// Search result value colors
|
|
|
|
|
|
|
|
|
|
|
|
if (self.colors && self.field_color) { |
|
|
|
|
|
var value_ids = []; |
|
|
|
|
|
for (var index in values) { |
|
|
|
|
|
value_ids.push(values[index].id); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// RPC request to get field_color from Objects
|
|
|
|
|
|
Objects.query([self.field_color]) |
|
|
|
|
|
.filter([['id', 'in', value_ids]]) |
|
|
|
|
|
.all().done(function (objects) { |
|
|
|
|
|
console.log(objects); |
|
|
|
|
|
for (var index in objects) { |
|
|
|
|
|
var value = values[index]; |
|
|
|
|
|
var color = self.colors[objects[index].state] || 'black'; |
|
|
|
|
|
value.label = '<span style="color:'+color+'">'+value.label+'</span>'; |
|
|
|
|
|
} |
|
|
|
|
|
def.resolve(values); |
|
|
|
|
|
}); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
// search more... if more results than max
|
|
|
// search more... if more results than max
|
|
|
|
|
|
|
|
@ -162,8 +188,11 @@ openerp.web_m2x_options = function (instance) { |
|
|
classname: 'oe_m2o_dropdown_option' |
|
|
classname: 'oe_m2o_dropdown_option' |
|
|
}); |
|
|
}); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
def.resolve(values); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Check if colors specified to wait for RPC
|
|
|
|
|
|
if (!(self.field_color && self.colors)){ |
|
|
|
|
|
def.resolve(values); |
|
|
|
|
|
} |
|
|
}); |
|
|
}); |
|
|
|
|
|
|
|
|
return def; |
|
|
return def; |
|
|