From 11ed7027e7292dc7b1ad0a3cce255580c1745d17 Mon Sep 17 00:00:00 2001
From: Joel McKinnon <joel.g.mckinnon@nasa.gov>
Date: Tue, 25 Feb 2020 09:31:29 -0800
Subject: [PATCH] enable trigger

---
 src/plugins/condition/components/Condition.vue           | 7 ++++---
 src/plugins/condition/components/ConditionCollection.vue | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/plugins/condition/components/Condition.vue b/src/plugins/condition/components/Condition.vue
index dbd5d91b2f..ad0170274e 100644
--- a/src/plugins/condition/components/Condition.vue
+++ b/src/plugins/condition/components/Condition.vue
@@ -103,7 +103,9 @@
                                     <li class="has-local-controls t-condition">
                                         <label>Match when</label>
                                         <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="any">any criteria are met</option>
                                             </select>
@@ -118,7 +120,7 @@
                                                :telemetry="telemetry"
                                                :criterion="criterion"
                                                :index="index"
-                                               :trigger="trigger"
+                                               :trigger="domainObject.configuration.trigger"
                                                @persist="persist"
                                     />
                                 </ul>
@@ -199,7 +201,6 @@ export default {
             domainObject: this.domainObject,
             currentCriteria: this.currentCriteria,
             expanded: true,
-            trigger: 'all',
             selectedOutputKey: '',
             stringOutputField: false,
             outputOptions: ['false', 'true', 'string']
diff --git a/src/plugins/condition/components/ConditionCollection.vue b/src/plugins/condition/components/ConditionCollection.vue
index 0ecd217d2c..83f50aa8d7 100644
--- a/src/plugins/condition/components/ConditionCollection.vue
+++ b/src/plugins/condition/components/ConditionCollection.vue
@@ -243,7 +243,7 @@ export default {
             const configurationTemplate = {
                 name: isDefault ? 'Default' : (isClone ? 'Copy of ' : '') + 'Unnamed Condition',
                 output: 'false',
-                trigger: 'any',
+                trigger: 'all',
                 criteria: isDefault ? [] : [{
                     telemetry: '',
                     operation: '',