Merge pull request angular-ui#2237 from pedroclayman/master

added an 'aggregationLabel' attribute on colDef
cookednoodles · Dec 8, 2014 · d1bb517 · d1bb517
2 parents e6cf438 + cfcd55d
commit d1bb517
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 4 deletions.
diff --git a/src/js/core/factories/GridColumn.js b/src/js/core/factories/GridColumn.js
@@ -676,17 +676,22 @@ angular.module('ui.grid')
    * @ngdoc function
    * @name getAggregationText
    * @methodOf ui.grid.class:GridColumn
-   * @description Gets the aggregation label using i18n, including 
-   * deciding whether or not to display based on colDef.aggregationHideLabel
-   * 
+   * @description Gets the aggregation label from colDef.aggregationLabel if
+   * specified or by using i18n, including deciding whether or not to display
+   * based on colDef.aggregationHideLabel.
+   *
    * @param {string} label the i18n lookup value to use for the column label
    * 
    */
   GridColumn.prototype.getAggregationText = function () {
     var self = this;
     if ( self.colDef.aggregationHideLabel ){
       return '';
-    } else {
+    }
+    else if ( self.colDef.aggregationLabel ) {
+      return self.colDef.aggregationLabel;
+    }
+    else {
       switch ( self.colDef.aggregationType ){
         case uiGridConstants.aggregationTypes.count:
           return i18nService.getSafeText('aggregation.count');

diff --git a/test/unit/core/factories/GridColumn.spec.js b/test/unit/core/factories/GridColumn.spec.js
@@ -208,6 +208,36 @@ describe('GridColumn factory', function () {
       expect(grid.columns[1].getAggregationValue()).toEqual(5);
       expect(grid.columns[1].getAggregationText()).toEqual('');
     });
+
+    it('max, with custom label', function() {
+      var customLabel = 'custom label';
+
+      grid.options.columnDefs[1].aggregationType = uiGridConstants.aggregationTypes.max;
+      grid.options.columnDefs[1].aggregationLabel = customLabel;
+      grid.options.columnDefs[1].aggregationHideLabel = false;
+
+      buildCols();
+      grid.modifyRows(grid.options.data);
+      grid.setVisibleRows(grid.rows);
+
+      expect(grid.columns[1].getAggregationValue()).toEqual(5);
+      expect(grid.columns[1].getAggregationText()).toEqual(customLabel);
+    });
+
+    it('max, with custom label while also being hidden', function() {
+      var customLabel = 'custom label';
+
+      grid.options.columnDefs[1].aggregationType = uiGridConstants.aggregationTypes.max;
+      grid.options.columnDefs[1].aggregationLabel = customLabel;
+      grid.options.columnDefs[1].aggregationHideLabel = true;
+
+      buildCols();
+      grid.modifyRows(grid.options.data);
+      grid.setVisibleRows(grid.rows);
+
+      expect(grid.columns[1].getAggregationValue()).toEqual(5);
+      expect(grid.columns[1].getAggregationText()).toEqual('');
+    });
   });
 
   describe('unsort', function() {