Skip to content

Commit 5c888ed

Browse files
authored
Fix for totals row
Removed old gtRender filter
1 parent 9558a0b commit 5c888ed

File tree

2 files changed

+1
-19
lines changed

2 files changed

+1
-19
lines changed

directive/generic-table/generic-table.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<th ng-repeat="field in ::gtFields | orderBy:'columnOrder' track by field.objectKey" ng-show=":gtRefresh:gtSettings | getProperty:field.objectKey:'visible'" ng-class=":gtRefresh:[field.classNames, (field.objectKey | camelToDash) + '-column', 'sort-'+(gtSettings | getProperty:field.objectKey:'sort')]"><span ng-click=":gtRefresh:(gtSettings | getProperty:field.objectKey:'sort') === 'enable' ? sort(field.objectKey):(gtSettings | getProperty:field.objectKey:'sort') === 'asc' ? sort(field.objectKey):(gtSettings | getProperty:field.objectKey:'sort') === 'desc' ? sort(field.objectKey):''">{{::field.name}}</span></th>
77
</tr>
88
<tr ng-if="gtTotals" ng-class="::gtRowTransition ? 'fade-in animate':''">
9-
<td ng-repeat="field in ::gtFields | orderBy:'columnOrder' track by field.objectKey" class="total-column" ng-show=":gtRefresh:gtSettings | getProperty:field.objectKey:'visible'" ng-class="::[(gtFields | getProperty:field.objectKey:'classNames'), (field.objectKey | camelToDash) + '-column']" ng-bind-html="::gtFields | gtRender:gtTotals:field.objectKey"></td>
9+
<td ng-repeat="field in ::gtFields | orderBy:'columnOrder' track by field.objectKey" class="total-column" ng-show=":gtRefresh:gtSettings | getProperty:field.objectKey:'visible'" ng-class="::[(gtFields | getProperty:field.objectKey:'classNames'), (field.objectKey | camelToDash) + '-column']" field-settings="::field" gt-render row-data="::gtTotals" gt-compile="::field.compile"></td>
1010
</tr>
1111
</thead>
1212
<tbody>

directive/generic-table/generic-table.js

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -489,24 +489,6 @@ angular.module('generic.table').directive('genericTable', function() {
489489
} catch (error) {
490490
console.log('cannot read property: "' + property + '" on missing key: "' + key + '" in settings.', error);
491491
}
492-
return output;
493-
}
494-
}).filter('gtRender',function($filter,$compile){
495-
return function(settings, row, key){
496-
//console.log('render');
497-
var output;
498-
//var output = angular.isArray(settings) ? $filter('filter')(settings,{objectKey:key},true)[0][key]: row[key];
499-
if (angular.isArray(settings)) {
500-
var renderMethod = $filter('filter')(settings,{objectKey:key},true)[0].render;
501-
if(renderMethod && angular.isFunction(renderMethod)){
502-
output = $compile(renderMethod(row, key))();
503-
} else {
504-
output = row[key];
505-
}
506-
} else {
507-
output = row[key];
508-
}
509-
510492
return output;
511493
}
512494
}).filter('camelToDash',function(){

0 commit comments

Comments
 (0)