Browse Source
Add ability to use custom translations and labels containing apostrophe in table default sort order (#2397)
pull/2433/head
Chantsova Ekaterina
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
3 additions and
3 deletions
-
ui/src/app/widget/lib/entities-table-widget.js
-
ui/src/app/widget/lib/entities-table-widget.tpl.html
|
|
|
@ -196,9 +196,9 @@ function EntitiesTableWidgetController($element, $scope, $filter, $mdMedia, $mdP |
|
|
|
if (vm.settings.defaultSortOrder && vm.settings.defaultSortOrder.length) { |
|
|
|
vm.defaultSortOrder = vm.settings.defaultSortOrder; |
|
|
|
if (vm.settings.defaultSortOrder.charAt(0) === "-") { |
|
|
|
vm.defaultSortOrder = "-'" + vm.settings.defaultSortOrder.substring(1) + "'"; |
|
|
|
vm.defaultSortOrder = '-"' + utils.customTranslation(vm.settings.defaultSortOrder.substring(1), vm.settings.defaultSortOrder.substring(1)) + '"'; |
|
|
|
} else { |
|
|
|
vm.defaultSortOrder = "'" + vm.settings.defaultSortOrder + "'"; |
|
|
|
vm.defaultSortOrder = '"' + utils.customTranslation(vm.settings.defaultSortOrder, vm.settings.defaultSortOrder) + '"'; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -41,7 +41,7 @@ |
|
|
|
<table md-table> |
|
|
|
<thead fix-head md-head md-order="vm.query.order" md-on-reorder="vm.onReorder"> |
|
|
|
<tr md-row> |
|
|
|
<th ng-if="column.display" md-column md-order-by="'{{ column.label }}'" ng-repeat="column in vm.columns"><span>{{ column.title }}</span></th> |
|
|
|
<th ng-if="column.display" md-column md-order-by='"{{column.label}}"' ng-repeat="column in vm.columns"><span>{{ column.title }}</span></th> |
|
|
|
<th md-column class="tb-action-cell" layout="row" layout-align="end center"></th> |
|
|
|
</tr> |
|
|
|
</thead> |
|
|
|
|