dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add ability to use custom translations and labels containing apostrophe in table default sort order (#2397)

Browse Source
This commit is contained in:
Chantsova Ekaterina 2020-02-19 16:10:54 +02:00 committed by GitHub
parent 7adeaf21c6
commit 1540f08695
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/src/app/widget/lib/entities-table-widget.js
View File

@ -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) + '"';
}
}

2
ui/src/app/widget/lib/entities-table-widget.tpl.html
View File

@ -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>