Merge remote-tracking branch 'origin/master'

Author: swalters

src/features/grouping/js/grouping.js

@@ -889,9 +889,6 @@
         // Broken out as shouldn't create functions in a loop.
         var updateProcessingState = function( groupFieldState, stateIndex ) {
           var fieldValue = grid.getCellValue(row, groupFieldState.col); 
-          if ( typeof(fieldValue) === 'undefined' || fieldValue === null ){
-            fieldValue = grid.options.groupingNullLabel;
-          }
 
           // look for change of value - and insert a header
           if ( !groupFieldState.initialised || rowSorter.getSortFn(grid, groupFieldState.col, renderableRows)(fieldValue, groupFieldState.currentValue) !== 0 ){
@@ -1007,8 +1004,9 @@
         var col = processingState[stateIndex].col;
 
         var newValue = grid.getCellValue(renderableRows[rowIndex], col);
+        var newDisplayValue = newValue;
         if ( typeof(newValue) === 'undefined' || newValue === null ) {
-          newValue = grid.options.groupingNullLabel;
+          newDisplayValue = grid.options.groupingNullLabel;
         }
 
         var cacheItem = grid.grouping.oldGroupingHeaderCache;
@@ -1027,7 +1025,7 @@
           gridClassFactory.rowTemplateAssigner.call(grid, headerRow);
         }
 
-        headerRow.entity['$$' + processingState[stateIndex].col.uid] = { groupVal: newValue };
+        headerRow.entity['$$' + processingState[stateIndex].col.uid] = { groupVal: newDisplayValue };
         headerRow.treeLevel = stateIndex;
         headerRow.groupHeader = true;
         headerRow.internalRow = true;

src/features/grouping/test/grouping.spec.js

@@ -28,13 +28,21 @@ describe('ui.grid.grouping uiGridGroupingService', function () {
       {field: 'col0', enableGrouping: true},
       {field: 'col1', enableGrouping: true},
       {field: 'col2', enableGrouping: true},
-      {field: 'col3', enableGrouping: true}
+      {field: 'col3', enableGrouping: true},
+      {field: 'col4', enableGrouping: true, type: 'date'}
     ];
 
     uiGridGroupingService.initializeGrid(grid, $scope);
     var data = [];
     for (var i = 0; i < 10; i++) {
-      data.push({col0: 'a_' + Math.floor(i/4), col1: 'b_' + Math.floor(i/2), col2: 'c_' + i, col3: 'd_' + i});
+
+      data.push({
+        col0: 'a_' + Math.floor(i/4),
+        col1: 'b_' + Math.floor(i/2),
+        col2: 'c_' + i,
+        col3: 'd_' + i,
+        col4: i > 5 ? new Date(2015, 6, 1) : null
+      });
     }
     grid.options.data = data;
 
@@ -83,6 +91,15 @@ describe('ui.grid.grouping uiGridGroupingService', function () {
       var groupedRows = uiGridGroupingService.groupRows.call( grid, grid.rows.slice(0) );
       expect( groupedRows.length ).toEqual( 18, 'all rows are present, including the added group headers' );
     });
+
+    it( 'group by col4 (type date with nulls)', function() {
+      spyOn(gridClassFactory, 'rowTemplateAssigner').andCallFake( function() {});
+      grid.columns[4].grouping = { groupPriority: 1 };
+
+      uiGridGroupingService.tidyPriorities(grid);
+      var groupedRows = uiGridGroupingService.groupRows.call( grid, grid.rows.slice(0) );
+      expect( groupedRows.length ).toEqual( 12, 'all rows are present, including two group header rows' );
+    });
   });
 
   describe('initialiseProcessingState', function() {