Bug 10190: Fix false conflict error when editing specific trigger rules
When editing a specific rule (e.g. */Kids/Books) alongside an all/all/all rule, the conflict check incorrectly reported a conflict. The effective=true API response always returns context as */*/* (fallback), so ruleSetInDb.context differed from currentRuleSet.context (which was overridden to the real context). Fix by overriding ruleSetInDb.context before the hasConflict comparison, consistent with the existing pattern in setCurrentRuleSet. Signed-off-by: Michaela <michaela.sieber@kit.edu> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Pedro Amorim <pedro.amorim@openfifth.co.uk>
This commit is contained in:
parent
b760367e25
commit
4fdc9c76e1
|
|
@ -620,6 +620,11 @@ export default {
|
|||
this.context,
|
||||
true
|
||||
);
|
||||
// effective=true returns context as */*/* (fallback); override to match
|
||||
// the queried context, consistent with setCurrentRuleSet
|
||||
if (ruleSetInDb) {
|
||||
ruleSetInDb.context = { ...this.context };
|
||||
}
|
||||
if (
|
||||
this.hasConflict(
|
||||
ruleSetInDb,
|
||||
|
|
|
|||
Loading…
Reference in New Issue