diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js index 46d0eeb7ddee0d9cd08acdd763a09989c005ea06..17788bda923b2c2e95d3ae41be214a16d4e4e79e 100644 --- a/src/js/DefaultRules.js +++ b/src/js/DefaultRules.js @@ -97,12 +97,12 @@ window.DefaultRules = (function() { // We also ignore inapplicable assignments for the current slave, so we only merge assignments that are valid if (rule.setAssignment === null) { delete rule.setAssignment; - return; + return rule; } const job = App.Utils.jobForAssignment(rule.setAssignment); if (job === undefined) { r += `<span class="red">raWidgets missing case for assignment 'V.{rule.setAssignment}'</span>.`; - return; + return rule; } switch (rule.setAssignment) { case "rest": @@ -2902,7 +2902,7 @@ window.DefaultRules = (function() { * @param {App.RA.RuleSetters} rule */ function ProcessLabel(slave, rule) { - + //mass removal of old tags, variant from '*' mask. if (rule.removeLabel !== null && rule.removeLabel !== '' && rule.removeLabel == '*') { slave.custom.label = slave.custom.label.replace(/(?:\[.+\])+/, ""); @@ -2919,14 +2919,14 @@ window.DefaultRules = (function() { let tags = [], i; 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]}]`)) { 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.label != null && rule.label !== '') @@ -2938,7 +2938,7 @@ window.DefaultRules = (function() { r += `<br>${slave.slaveName} has been tagged as ${tags[i]}`; } } - + } return DefaultRules;