diff options
| author | Xavier Morel <xmo@openerp.com> | 2011-12-20 16:22:23 +0100 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2011-12-20 16:22:23 +0100 |
| commit | 4cb4ac397b8f5a6ed7aab4ce88936ea99fc62e2d (patch) | |
| tree | 74a9ff000f4939bd3598c2c699e6adc39ed661ad /addons/web/static | |
| parent | b1b12987326e73a62807a42169f47ac8ce2624d8 (diff) | |
[FIX] view node attributes should have precedence over field attributes for a field when they collide
lp bug: https://launchpad.net/bugs/906893 fixed
bzr revid: xmo@openerp.com-20111220152223-vz7ibc1hjydohwk5
Diffstat (limited to 'addons/web/static')
| -rw-r--r-- | addons/web/static/src/js/view_list.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js index 472001390e8..f3369c4053b 100644 --- a/addons/web/static/src/js/view_list.js +++ b/addons/web/static/src/js/view_list.js @@ -326,7 +326,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView# var field_to_column = function (field) { var name = field.attrs.name; var column = _.extend({id: name, tag: field.tag}, - field.attrs, fields[name]); + fields[name], field.attrs); // modifiers computer if (column.modifiers) { var modifiers = JSON.parse(column.modifiers); |
