Merge pull request #5148 from ERobishaw/master

swalters · swalters · commit 41d3f0d05bf8 · 2016-02-23T09:19:12.000-06:00
Allows setting $$treeLevel to -1 on a row's entity
diff --git a/src/features/tree-base/js/tree-base.js b/src/features/tree-base/js/tree-base.js
@@ -1495,7 +1495,7 @@
        * @param {gridRow} row the parent we're finalising
        */
       finaliseAggregations: function( row ){
-        if ( typeof(row.treeNode.aggregations) === 'undefined' ){
+        if ( row == null || typeof(row.treeNode.aggregations) === 'undefined' ){
           return;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1495,7 +1495,7 @@`
`1495`	`1495`	`* @param {gridRow} row the parent we're finalising`
`1496`	`1496`	`*/`
`1497`	`1497`	`finaliseAggregations: function( row ){`
`1498`		`- if ( typeof(row.treeNode.aggregations) === 'undefined' ){`
	`1498`	`+ if ( row == null \|\| typeof(row.treeNode.aggregations) === 'undefined' ){`
`1499`	`1499`	`return;`
`1500`	`1500`	`}`
`1501`	`1501`