diff options
| author | Xavier Morel <xmo@openerp.com> | 2012-12-06 14:51:14 +0100 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2012-12-06 14:51:14 +0100 |
| commit | 7ac99cbeafc88f0fe6f6c2ee425c9ef87180a2ce (patch) | |
| tree | 33be658f2ccacade894ed9c5e9d5d35976d89ad1 /addons/web/static/src | |
| parent | 96408a36f03f7184c7a43e7b68d3eea5e73e924e (diff) | |
[FIX] form selection field: don't interpret value 0 as false in the template when the code doesn't do so
bzr revid: xmo@openerp.com-20121206135114-nuwc3wdc6zatbl3d
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/view_form.js | 11 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 5 |
2 files changed, 8 insertions, 8 deletions
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 21c3b3f43d9..d5feb342ebe 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2680,13 +2680,10 @@ instance.web.form.FieldSelection = instance.web.form.AbstractField.extend(instan init: function(field_manager, node) { var self = this; this._super(field_manager, node); - this.values = _.clone(this.field.selection); - _.each(this.values, function(v, i) { - if (v[0] === false && v[1] === '') { - self.values.splice(i, 1); - } - }); - this.values.unshift([false, '']); + this.values = _(this.field.selection).chain() + .reject(function (v) { return v[0] === false && v[1] === ''; }) + .unshift([false, '']) + .value(); }, initialize_content: function() { // Flag indicating whether we're in an event chain containing a change diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index c272e1f8eb4..2161bc84f3d 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1054,7 +1054,10 @@ t-att-autofocus="widget.node.attrs.autofocus" t-att-id="widget.id_for_label"> <t t-foreach="widget.values" t-as="option"> - <option><t t-esc="widget.node.attrs.placeholder" t-if="option[0] == false and widget.node.attrs.placeholder"/><t t-esc="option[1]" t-if="option[0] != false"/></option> + <option> + <t t-esc="widget.node.attrs.placeholder" t-if="option[0] === false and widget.node.attrs.placeholder"/> + <t t-esc="option[1]" t-if="option[0] !== false"/> + </option> </t> </select> </span> |