diff options
| author | Gery Debongnie <ged@openerp.com> | 2014-01-30 15:27:23 +0100 |
|---|---|---|
| committer | Gery Debongnie <ged@openerp.com> | 2014-01-30 15:27:23 +0100 |
| commit | 31294d0800a7a47e213bb652d43f6bb24501325b (patch) | |
| tree | d3e2ef9d0eb2036cca9dc6b766daea1c051d42a8 /addons/web | |
| parent | ce7ac857add0278019c922ae25cdae998f977a27 (diff) | |
| parent | 2149c1af03327b63f4c9d3594acb2818b851d5d7 (diff) | |
[MERGE] merge trunk-new-graphview-ged into trunk (tweaks to pivot table look, and some bug fixes)
bzr revid: ged@openerp.com-20140130142723-9yt19h8x7vgt3woe
Diffstat (limited to 'addons/web')
| -rw-r--r-- | addons/web/static/src/js/data.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js index a2e3e53db3e..4a0807a727a 100644 --- a/addons/web/static/src/js/data.js +++ b/addons/web/static/src/js/data.js @@ -234,9 +234,9 @@ instance.web.QueryGroup = instance.web.Class.extend({ this.model = new instance.web.Model( model, fixed_group.__context, fixed_group.__domain); - var group_size = fixed_group[grouping_field + '_count'] || fixed_group.__count || 0; + var raw_field = grouping_field && grouping_field.split(':')[0]; + var group_size = fixed_group[raw_field + '_count'] || fixed_group.__count || 0; var leaf_group = fixed_group.__context.group_by.length === 0; - var raw_field = (_.contains(grouping_field, ':')) ? grouping_field.split(':')[0] : grouping_field; this.attributes = { folded: !!(fixed_group.__fold), |