From 31e793b3d057c4d7c83535ad31e7e7d66570a449 Mon Sep 17 00:00:00 2001
From: pregmodfan <pregmodfan@cock.li>
Date: Mon, 28 Oct 2019 23:44:35 +0200
Subject: [PATCH] RA multi tagging and global clean tested
---
src/js/DefaultRules.js | 31 +++++++++++++------------------
src/js/rulesAssistant.js | 3 +--
2 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js
index 2585e787bd5..0ab8ce5c76b 100644
--- a/src/js/DefaultRules.js
+++ b/src/js/DefaultRules.js
@@ -3090,45 +3090,40 @@ window.DefaultRules = (function() {
//mass removal of old tags, variant from '*' mask.
if (rule.removeLabel !== null && rule.removeLabel !== '' && rule.removeLabel == '*') {
- //console.log(`${slave.slaveName}: rules remove triggered ('*').`);
slave.custom.label = slave.custom.label.replace(/(?:\[.+\])+/, "");
- r += `All <br>${slave.slaveName}'s tags is removed.`;
+ r += `<br>All ${slave.slaveName}'s tags is removed.`;
}
//mass removal of old tags, variant from GUI swith.
- console.log(rule.labelTagsClear);
if (rule.labelTagsClear === true) {
- //console.log(`${slave.slaveName}: rules remove triggered (labelTagsClean).`);
slave.custom.label = slave.custom.label.replace(/(?:\[.+\])+/, "");
- r += `All <br>${slave.slaveName}'s tags is removed.`;
+ r += `<br>All ${slave.slaveName}'s tags is removed.`;
}
//removing tags selected for removal.
let tags = [], i;
- if (rule.label != null && rule.label !== '')
- tags = rule.label.split("|");
-
+ if (rule.removeLabel != null && rule.removeLabel !== '')
+ tags = rule.removeLabel.split("|");
+
for (i in tags) {
- if (tags[i] != null && tags[i] !== '' && !slave.custom.label.includes(`[${tags[i]}]`)) {
- //console.log(`${slave.slaveName}: rule add with |${tags[i]}| triggered.`);
- slave.custom.label = `${slave.custom.label}[${tags[i]}]`;
- r += `<br>${slave.slaveName} has been tagged as ${tags[i]}`;
+ if (tags[i] !== null && tags[i] !== '' && slave.custom.label.includes(`[${tags[i]}]`)) {
+ slave.custom.label = slave.custom.label.replace(`[${tags[i]}]`, "");
+ r += `<br>${slave.slaveName}'s tag [${tags[i]}] is removed.`;
}
}
//finally adding new tags.
tags = [];
- if (rule.removeLabel != null && rule.removeLabel !== '')
+ if (rule.label != null && rule.label !== '')
tags = rule.label.split("|");
for (i in tags) {
- if (tags[i] !== null && tags[i] !== '' && slave.custom.label.includes(`[${tags[i]}]`)) {
- //console.log(`${slave.slaveName}: rule remove with |${tags[i]}| triggered.`);
- slave.custom.label = slave.custom.label.replace(`[${tags[i]}]`, "");
- r += `<br>${slave.slaveName}'s tag [${tags[i]}] is removed.`;
+ if (tags[i] != null && tags[i] !== '' && !slave.custom.label.includes(`[${tags[i]}]`)) {
+ slave.custom.label = `${slave.custom.label}[${tags[i]}]`;
+ r += `<br>${slave.slaveName} has been tagged as ${tags[i]}`;
}
}
-
+
}
return DefaultRules;
diff --git a/src/js/rulesAssistant.js b/src/js/rulesAssistant.js
index a6c1f53dec5..abab9a1e041 100644
--- a/src/js/rulesAssistant.js
+++ b/src/js/rulesAssistant.js
@@ -595,7 +595,6 @@ App.RA.ruleDeepAssign = function deepAssign(target, source) {
}
deepAssign(target[key], source[key]);
} else if (key == "label" || key == "removeLabel") {
- console.log( key + " key found");
if (source[key] != null)
if (target[key] != null)
target[key] += "|" + source[key];
@@ -615,6 +614,6 @@ App.RA.ruleDeepAssign = function deepAssign(target, source) {
}
}
}
- console.log(target);
+
return target;
};
--
GitLab