pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[fix] small problem in field selection

Browse Source 
bzr revid: nicolas.vanhoren@openerp.com-20110707154649-u6djzfim3wc9zg97
This commit is contained in:
niv-openerp
2011-07-07 17:46:49 +02:00
parent e688cd74d0
commit b4d3c937ad
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/base/static/src/js/form.js
+3 -3
View File
@@ -1133,12 +1133,12 @@ openerp.base.form.FieldSelection = openerp.base.form.Field.extend({
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);
this.$element.find('select').val(option === undefined ? '' : option.ikey);
},
set_value_from_ui: function() {
var ikey = this.$element.find('select').val();
var option = _.detect(this.field_index, function(x) {return x.ikey === ikey;});
this.value = option.ekey;
this.value = option === undefined ? false : option.ekey;
},
update_dom: function() {
this._super.apply(this, arguments);
@@ -1147,7 +1147,7 @@ openerp.base.form.FieldSelection = openerp.base.form.Field.extend({
validate: function() {
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;
this.invalid = this.required && (option === undefined || option.ekey === false);
},
focus: function() {
this.$element.find('select').focus();