Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into condition-clone

This commit is contained in:
Joshi
2020-02-04 15:19:11 -08:00

View File

@ -67,8 +67,8 @@
:current-condition-identifier="currentConditionIdentifier" :current-condition-identifier="currentConditionIdentifier"
:condition-index="index" :condition-index="index"
@updateCurrentCondition="updateCurrentCondition" @updateCurrentCondition="updateCurrentCondition"
@removeCondition="removeCondition"
@clone-condition="cloneCondition" @clone-condition="cloneCondition"
@removeCondition="removeCondition"
@conditionResultUpdated="handleConditionResult" @conditionResultUpdated="handleConditionResult"
@setMoveIndex="setMoveIndex" @setMoveIndex="setMoveIndex"
/> />
@ -225,7 +225,8 @@ export default {
this.conditionCollection.unshift(conditionDomainObject.identifier); this.conditionCollection.unshift(conditionDomainObject.identifier);
} else { } else {
this.conditionCollection.splice(index + 1, 0, conditionDomainObject.identifier); this.conditionCollection.splice(index + 1, 0, conditionDomainObject.identifier);
} this.persist(); }
this.persist();
}, },
updateCurrentCondition(identifier) { updateCurrentCondition(identifier) {
this.currentConditionIdentifier = identifier; this.currentConditionIdentifier = identifier;