From cf3273751f46d45d3acfc66cfaea61b55e1745ea Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 26 Nov 2019 14:47:59 +0100 Subject: [PATCH] Bug 15522: Handle deprecated rules For upgraded installs. Also add a log in the console if it happens. Signed-off-by: Lisette Scheer Signed-off-by: Lari Taskula --- koha-tmpl/intranet-tmpl/prog/js/src/admin/policy/rules.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/koha-tmpl/intranet-tmpl/prog/js/src/admin/policy/rules.js b/koha-tmpl/intranet-tmpl/prog/js/src/admin/policy/rules.js index 54be602ccf..a46160eb9f 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/src/admin/policy/rules.js +++ b/koha-tmpl/intranet-tmpl/prog/js/src/admin/policy/rules.js @@ -52,6 +52,12 @@ export default ( window.rules = new class { if ( !this.rules[ruleBranchCode][ruleCategoryCode][ruleItemType] ) continue; for ( let [ rule_name, rule_value ] of Object.entries( this.rules[ruleBranchCode][ruleCategoryCode][ruleItemType] ) ) { + + if ( $.inArray( ['restrictedtype', 'accountsent', 'reservecharge'], rule_name ) ) continue; + if (!(rule_name in RULE_KINDS)){ + console.log("A new rule " + rule_name + " has been added but not defined"); + } + if ( scope_name !== undefined && scope_name != RULE_KINDS[rule_name].scope_name ) continue; result.push( { -- 2.20.1