test if scope has property before overidding it

GladysAssistant · Nov 12, 2016 · 1a2388d · 1a2388d
1 parent a437616
commit 1a2388d
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/api/core/scenario/scenario.trigger.js b/api/core/scenario/scenario.trigger.js
@@ -18,11 +18,11 @@ module.exports = function(params) {
 
             // initialize scope
             params.scope = params.scope || {};
-            if(params.house) params.scope.house = params.house;
-            if(params.user) params.scope.user = params.user;
-            if(params.room) params.scope.room = params.room;
-            if(params.value) params.scope.value = params.value;
-            if(params.datetime) params.scope.datetime = params.datetime;
+            if(params.house && !params.scope.hasOwnProperty('house')) params.scope.house = params.house;
+            if(params.user && !params.scope.hasOwnProperty('user')) params.scope.user = params.user;
+            if(params.room && !params.scope.hasOwnProperty('room')) params.scope.room = params.room;
+            if(params.value && !params.scope.hasOwnProperty('value')) params.scope.value = params.value;
+            if(params.datetime && !params.scope.hasOwnProperty('datetime')) params.scope.datetime = params.datetime;
 
             // foreach launcher, we verify if the condition is satisfied
             // and if yes, start all the actions