Merge pull request #3607 from PaulL1/treebase

Treebase

Author: PaulL1

misc/tutorial/208_save_state.ngdoc

@@ -49,13 +49,18 @@ to something different, and use the restore button to set the grid back the way
         saveFocus: false,
         saveScroll: true,
         saveGroupingExpandedStates: true,
+        enableFiltering: true,
+        columnDefs: [
+          { name: 'name' },
+          { name: 'gender' },
+          { name: 'company' }
+        ],
         onRegisterApi: function(gridApi){ 
           $scope.gridApi = gridApi;
         }
       };
-      $scope.gridOptions.enableFiltering = true;
       $scope.state = {};
-      
+
       $scope.saveState = function() {
         $scope.state = $scope.gridApi.saveState.save();
       };

misc/tutorial/317_custom_templates.ngdoc

@@ -15,6 +15,8 @@ In this example we create a grid almost the same as the most basic one, but with
 with a cellTemplate that totals all the items above it in the grid.  This template continues to work when the data is 
 filtered or sorted.
 
+The custom row template merges all the cells together when the entity.merge value is true.
+
 You can use [grid.appScope](/docs/#/tutorial/305_appScope) in your row template to access
 elements in your controller's scope. More details are on
 the [scopes](/docs/#/tutorial/305_appScope) tutorial.
@@ -40,7 +42,8 @@ In the cellTemplate you have access to `grid`, `row` and `column`, which allows
           $interval.cancel(sec);
           $scope.wait = '';
           return '<div ng-class="{ \'my-css-class\': grid.appScope.rowFormatter( row ) }">' +
-                     '  <div ng-repeat="(colRenderIndex, col) in colContainer.renderedColumns track by col.colDef.name" class="ui-grid-cell" ng-class="{ \'ui-grid-row-header-cell\': col.isRowHeader }"  ui-grid-cell></div>' +
+                     '  <div ng-if="row.entity.merge">{{row.entity.title}}</div>' +
+                     '  <div ng-if="!row.entity.merge" ng-repeat="(colRenderIndex, col) in colContainer.renderedColumns track by col.colDef.name" class="ui-grid-cell" ng-class="{ \'ui-grid-row-header-cell\': col.isRowHeader }"  ui-grid-cell></div>' +
                      '</div>';
         }, 6000);
       }
@@ -57,6 +60,10 @@ In the cellTemplate you have access to `grid`, `row` and `column`, which allows
           data.forEach( function(row, index) {
             row.widgets = index % 10;
           });
+          data[1].merge = true;
+          data[1].title = "A merged row";
+          data[4].merge = true;
+          data[4].title = "Another merged row";
           $scope.data = data;
         });
 

src/features/saveState/js/saveState.js

@@ -357,7 +357,16 @@
             }
 
             if ( grid.options.saveFilter ){
-              savedColumn.filters = angular.copy ( column.filters );
+              savedColumn.filters = [];
+              column.filters.forEach( function( filter ){
+                var copiedFilter = {};
+                angular.forEach( filter, function( value, key) {
+                  if ( key !== 'condition' && key !== '$$hashKey' && key !== 'placeholder'){
+                    copiedFilter[key] = value;
+                  }
+                });
+                savedColumn.filters.push(copiedFilter);
+              });
             }
 
             if ( !!grid.api.pinning && grid.options.savePinning ){
@@ -545,7 +554,12 @@
 
               if ( grid.options.saveFilter &&
                    !angular.equals(currentCol.filters, columnState.filters ) ){
-                currentCol.filters = angular.copy( columnState.filters );
+                columnState.filters.forEach( function( filter, index ){
+                  angular.extend( currentCol.filters[index], filter );
+                  if ( typeof(filter.term) === 'undefined' || filter.term === null ){
+                    delete currentCol.filters[index].term;
+                  }
+                });
                 grid.api.core.raise.filterChanged();
               }