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

enable trigger

Browse Source
This commit is contained in:
Joel McKinnon 2020-02-25 09:31:29 -08:00
parent d333fd5822
commit 8539d60562
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/condition/components/Condition.vue
View File

@ -103,7 +103,9 @@
<li class="has-local-controls t-condition"> <li class="has-local-controls t-condition">
<label>Match when</label> <label>Match when</label>
<span class="controls"> <span class="controls">
<select v-model="trigger"> <select v-model="domainObject.configuration.trigger"
@change="persist"
>
<option value="all">all criteria are met</option> <option value="all">all criteria are met</option>
<option value="any">any criteria are met</option> <option value="any">any criteria are met</option>
</select> </select>
@ -118,7 +120,7 @@
:telemetry="telemetry" :telemetry="telemetry"
:criterion="criterion" :criterion="criterion"
:index="index" :index="index"
:trigger="trigger" :trigger="domainObject.configuration.trigger"
@persist="persist" @persist="persist"
/> />
</ul> </ul>
@ -199,7 +201,6 @@ export default {
domainObject: this.domainObject, domainObject: this.domainObject,
currentCriteria: this.currentCriteria, currentCriteria: this.currentCriteria,
expanded: true, expanded: true,
trigger: 'all',
selectedOutputKey: '', selectedOutputKey: '',
stringOutputField: false, stringOutputField: false,
outputOptions: ['false', 'true', 'string'] outputOptions: ['false', 'true', 'string']

2
src/plugins/condition/components/ConditionCollection.vue
View File

@ -243,7 +243,7 @@ export default {
const configurationTemplate = { const configurationTemplate = {
name: isDefault ? 'Default' : (isClone ? 'Copy of ' : '') + 'Unnamed Condition', name: isDefault ? 'Default' : (isClone ? 'Copy of ' : '') + 'Unnamed Condition',
output: 'false', output: 'false',
trigger: 'any', trigger: 'all',
criteria: isDefault ? [] : [{ criteria: isDefault ? [] : [{
telemetry: '', telemetry: '',
operation: '', operation: '',