From 93796edaa5174d90a1b52172acba14149e9c076b Mon Sep 17 00:00:00 2001
From: Anony <solosenpai@protonmail.com>
Date: Sat, 18 Jan 2020 11:09:18 -0800
Subject: [PATCH] Fix for issue 1338, should allow for future between rules on
nested properties
---
src/js/rulesAssistant.js | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/src/js/rulesAssistant.js b/src/js/rulesAssistant.js
index 855c872d11c..df9badcf3b0 100644
--- a/src/js/rulesAssistant.js
+++ b/src/js/rulesAssistant.js
@@ -200,8 +200,20 @@ window.ruleAppliesP = function ruleAppliesP(cond, slave) {
flag = false;
break;
case "between": // between two values of a slave's attribute
+ let slaveAttribute = slave[cond.data.attribute];
+ if (slaveAttribute === undefined && cond.data.attribute.includes(".")) {
+ slaveAttribute = cond.data.attribute
+ .split(".")
+ .reduce(
+ (reduceSlave, attribute) =>
+ (reduceSlave && reduceSlave[attribute] !== undefined)
+ ? reduceSlave[attribute]
+ : undefined,
+ slave
+ );
+ }
flag = between(
- slave[cond.data.attribute],
+ slaveAttribute,
cond.data.value[0],
cond.data.value[1]);
break;
--
GitLab