diff options
| author | Xavier Morel <xmo@openerp.com> | 2011-05-24 11:11:25 +0200 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2011-05-24 11:11:25 +0200 |
| commit | 7758f281eda0dec93932e7aaa7414e2dafa9c2dd (patch) | |
| tree | 226fe09c1917d0da5c4560158340c6cf9def9edf /addons/base/static/src/js/data.js | |
| parent | 8a50dd16096e4ca5ee7432b5b83f7611697cff5c (diff) | |
[ADD] handling of group_by_no_leaf
bzr revid: xmo@openerp.com-20110524091125-ltohsi2zy6nbmi3p
Diffstat (limited to 'addons/base/static/src/js/data.js')
| -rw-r--r-- | addons/base/static/src/js/data.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/addons/base/static/src/js/data.js b/addons/base/static/src/js/data.js index 57ab2379e5c..0dbd3c14cec 100644 --- a/addons/base/static/src/js/data.js +++ b/addons/base/static/src/js/data.js @@ -106,9 +106,12 @@ openerp.base.ContainerDataGroup = openerp.base.DataGroup.extend( __domain: group.__domain, grouped_on: field_name, - length: group[field_name + '_count'], + // if terminal group and group_by_no_leaf => use group.__count + length: group[field_name + '_count'] || group.__count, value: group[field_name], + has_leaves: _.isUndefined(group.__count), + aggregates: aggregates }; }, |