Merge lp:~openerp-dev/openerp-web/saas-3-opw-606213-acl into lp:~openerp/openerp-web/saas-3

[Martin Trigaux (OpenERP)]

fixing pivot table errors

[Martin Trigaux (OpenERP) (mat-openerp)]

better fix done in saas-4

Unmerged revisions

3997. By Anaël Closson (openerp) on 2014-04-08

[FIX] web_graph: fast clicking on group by cause exceptions - opw 606213

=== modified file 'addons/web_graph/static/src/js/pivot_table.js'
--- addons/web_graph/static/src/js/pivot_table.js	2014-01-28 15:11:57 +0000
+++ addons/web_graph/static/src/js/pivot_table.js	2014-04-29 08:35:30 +0000
@@ -238,13 +238,13 @@
 	},
 
 	make_header: function (group, parent) {
-		var title = parent ? group.attributes.value : _t('Total');
+		var title = parent && group && group.attributes ? group.attributes.value : _t('Total');
         return {
 			id: _.uniqueId(),
 			path: parent ? parent.path.concat(title) : [],
 			title: title,
 			children: [],
-			domain: parent ? group.model._domain : this.domain,
+			domain: parent && group && group.model ? group.model._domain : this.domain,
 			root: parent ? parent.root : undefined,
 		};
 	},
@@ -434,7 +434,7 @@
 		var self = this,
             main = this.make_header(data, parent);
 
-		if (main.path.length < depth) {
+		if (main.path.length < depth && data) {
 			main.children = _.map(data.children || data, function (data_pt) {
 				return self.make_headers (data_pt, depth, main);
 			});