From 7e4ad2ed65652380d868709f85c33ca57f302296 Mon Sep 17 00:00:00 2001
From: ezsh <ezsh.junk@gmail.com>
Date: Thu, 29 Aug 2019 17:46:23 +0200
Subject: [PATCH] RA UI: fix assignment editing
Do not reset values from other button groups when editing assingments.
This allows two button groups to co-exist (regular assignments and
facility heads).
Fixes #1038.
---
src/js/rulesAssistantOptions.js | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index 938d479c00d..b3698d60ccf 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -865,6 +865,10 @@ window.rulesAssistantOptions = (function() {
);
}
+ getAllValues() {
+ return this.children.map(child => child.setvalue);
+ }
+
onchange() { return; }
}
@@ -1347,7 +1351,8 @@ window.rulesAssistantOptions = (function() {
}
onchange() {
- current_rule.condition.assignment = this.getSelection();
+ const allValues = this.getAllValues();
+ current_rule.condition.assignment = this.getSelection().concat(current_rule.condition.assignment.filter(a => !allValues.includes(a)));
}
getAttribute(what) {
--
GitLab