ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-23 01:18:57 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

[Tables] Restored telemetry datum field 'name'. Fixed bug with default sort not working

Browse Source
This commit is contained in:
Henry
2017-02-10 15:35:17 -08:00
parent a3311e4c57
commit 34dc457aff
3 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
platform/features/table/src/controllers/MCTTableController.js
View File

@ -122,7 +122,11 @@ define(
$scope.$watchCollection('filters', function () {
self.setRows($scope.rows);
});
$scope.$watch('headers', this.setHeaders);
$scope.$watch('headers', function (newHeaders, oldHeaders) {
if (newHeaders !== oldHeaders) {
this.setHeaders(newHeaders);
}
}.bind(this));
$scope.$watch('rows', this.setRows);
/*

4
platform/features/table/src/controllers/TelemetryTableController.js
View File

@ -240,6 +240,8 @@ define(
TelemetryTableController.prototype.loadColumns = function (objects) {
var telemetryApi = this.openmct.telemetry;
this.$scope.headers = [];
if (objects.length > 0) {
var metadatas = objects.map(telemetryApi.getMetadata.bind(telemetryApi));
var allColumns = telemetryApi.commonValuesForHints(metadatas, []);
@ -437,8 +439,6 @@ define(
return Promise.resolve(objects);
}
}
scope.headers = [];
scope.rows = [];
return getDomainObjects()