From 4fdc9c76e1e151e03aa83120bfc6b6a44056757a Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Mon, 16 Mar 2026 09:43:23 +0000 Subject: [PATCH] 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 Signed-off-by: Nick Clemens Signed-off-by: Pedro Amorim --- .../Admin/CirculationTriggers/CirculationTriggersFormAdd.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersFormAdd.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersFormAdd.vue index a0422292ed..98aec22f40 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersFormAdd.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersFormAdd.vue @@ -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,