From 54b803d69282b09e6228de53c5e493fbda78ad24 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 21 Jan 2020 18:47:48 +0100 Subject: [PATCH] Bug 15522: (follow-up) Handle deprecated rules Previous use of inArray was wrong. Signed-off-by: Lisette Scheer --- koha-tmpl/intranet-tmpl/prog/js/src/admin/policy/rules.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 a46160eb9f..7616df6bbe 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 @@ -53,7 +53,11 @@ export default ( window.rules = new class { 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 == "restrictedtype" // obsolete rules + || rule_name == "accountsent" + || rule_name == "reservecharge") + continue; + if (!(rule_name in RULE_KINDS)){ console.log("A new rule " + rule_name + " has been added but not defined"); } -- 2.17.1