ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-21 22:17:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into conditionSet-with-classes

Browse Source
This commit is contained in:
Joshi 2020-01-16 15:32:40 -08:00
commit ab6dae16f1
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/condition/ConditionSetCompositionPolicy.js
View File

@ -23,8 +23,7 @@
export default function ConditionSetCompositionPolicy(openmct) { export default function ConditionSetCompositionPolicy(openmct) {
return { return {
allow: function (parent, child) { allow: function (parent, child) {
let parentType = parent.type; if (parent.type === 'conditionSet' && !openmct.telemetry.isTelemetryObject(child)) {
if (parentType === 'conditionSet' && !openmct.telemetry.isTelemetryObject(child)) {
return false; return false;
} }

2
src/plugins/condition/ConditionSetCompositionPolicySpec.js
View File

@ -22,7 +22,7 @@
import ConditionSetCompositionPolicy from './ConditionSetCompositionPolicy'; import ConditionSetCompositionPolicy from './ConditionSetCompositionPolicy';
fdescribe('ConditionSetCompositionPolicy', () => { describe('ConditionSetCompositionPolicy', () => {
let policy; let policy;
let testTelemetryObject; let testTelemetryObject;

2
src/plugins/condition/plugin.js
View File

@ -20,7 +20,7 @@
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
import ConditionSetViewProvider from './ConditionSetViewProvider.js'; import ConditionSetViewProvider from './ConditionSetViewProvider.js';
import ConditionSetCompositionPolicy from "@/plugins/condition/ConditionSetCompositionPolicy"; import ConditionSetCompositionPolicy from "./ConditionSetCompositionPolicy";
export default function ConditionPlugin() { export default function ConditionPlugin() {