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

Merge branch 'master' of https://github.com/nasa/openmct into fix-any-telemetry

Browse Source
This commit is contained in:
Joshi 2020-04-01 09:55:55 -07:00
commit 8515a411bd
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/condition/components/Criterion.vue
View File

@ -201,6 +201,8 @@ export default {
if (foundMetadata.enumerations !== undefined) { if (foundMetadata.enumerations !== undefined) {
this.operationFormat = 'enum'; this.operationFormat = 'enum';
this.enumerations = foundMetadata.enumerations; this.enumerations = foundMetadata.enumerations;
} else if (foundMetadata.format === 'string' || foundMetadata.format === 'number') {
this.operationFormat = foundMetadata.format;
} else if (foundMetadata.hints.hasOwnProperty('range')) { } else if (foundMetadata.hints.hasOwnProperty('range')) {
this.operationFormat = 'number'; this.operationFormat = 'number';
} else if (foundMetadata.hints.hasOwnProperty('domain')) { } else if (foundMetadata.hints.hasOwnProperty('domain')) {
@ -208,7 +210,7 @@ export default {
} else if (foundMetadata.key === 'name') { } else if (foundMetadata.key === 'name') {
this.operationFormat = 'string'; this.operationFormat = 'string';
} else { } else {
this.operationFormat = 'string'; this.operationFormat = 'number';
} }
} }
this.updateInputVisibilityAndValues(); this.updateInputVisibilityAndValues();