odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[fix] many problems in selection fields, not handling correctly false value & not compatible with m2o 

bzr revid: nicolas.vanhoren@openerp.com-20110707141924-xx2ya1d53t2valw5
This commit is contained in:
niv-openerp 2011-07-07 16:19:24 +02:00
parent aa1ae20796
commit 17f3714bad
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
addons/base/static/src/js/form.js
View File

@ -1117,28 +1117,38 @@ openerp.base.form.FieldSelection = openerp.base.form.Field.extend({
init: function(view, node) {
this._super(view, node);
this.template = "FieldSelection";
this.field_index = [];
var self = this;
var i = 0;
_.each(this.field.selection, function(x) {
self.field_index.push({"ikey": "" + i, "ekey": x[0], "label": x[1]});
i = i + 1;
});
},
start: function() {
this._super.apply(this, arguments);
this.$element.find('select').change(this.on_ui_change);
},
set_value: function(value) {
this._super.apply(this, arguments);
if (value != null && value !== false) {
this.$element.find('select').val(value);
} else {
this.$element.find('select').val('false');
}
value = value === null ? false : value;
value = value instanceof Array ? value[0] : value;
this._super(value);
var option = _.detect(this.field_index, function(x) {return x.ekey === value;});
this.$element.find('select').val(option.ikey);
},
set_value_from_ui: function() {
this.value = this.$element.find('select').val();
var ikey = this.$element.find('select').val();
var option = _.detect(this.field_index, function(x) {return x.ikey === ikey;});
this.value = option.ekey;
},
update_dom: function() {
this._super.apply(this, arguments);
this.$element.find('select').attr('disabled', this.readonly);
},
validate: function() {
this.invalid = this.required && this.$element.find('select').val() === "";
var ikey = this.$element.find('select').val();
var option = _.detect(this.field_index, function(x) {return x.ikey === ikey;});
this.invalid = this.required && option.ekey === false;
},
focus: function() {
this.$element.find('select').focus();

6
addons/base/static/src/xml/base.xml
View File

@ -517,9 +517,9 @@
t-att-id="widget.element_id + '_field'"
t-att-class="'field_' + widget.type"
style="width: 100%">
<t t-foreach="widget.field.selection" t-as="options">
<option t-att-value="options[0]">
<t t-esc="options[1]"/>
<t t-foreach="widget.field_index" t-as="options">
<option t-att-value="options.ikey">
<t t-esc="options.label"/>
</option>
</t>
</select>