From 1a10d30260e0955fe47f5a4cf0880d044508ca0d Mon Sep 17 00:00:00 2001 From: David Gustafsson Date: Thu, 31 Oct 2019 13:41:14 +0100 Subject: [PATCH] Bug 14957: Replace filter value with label if one exists Signed-off-by: David Nind --- .../prog/en/modules/admin/marc-merge-rules.tt | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-merge-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-merge-rules.tt index 5300b351d6..fe4282f8b5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-merge-rules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-merge-rules.tt @@ -212,6 +212,18 @@ $(document).ready(function(){ } }; + //Kind of hack: Replace filter value with label when one exist + $('.rule-module').each(function() { + var $this = $(this); + var module = $this.text(); + if (module in module_filter_options) { + let $filter = $this.siblings('.rule-filter'); + if ($filter.text() in module_filter_options[module]) { + $filter.text(module_filter_options[module][$filter.text()]); + } + } + }); + var $filter_container = $('#filter-container'); /* Listen to module changes and set filter input accordingly */ @@ -248,6 +260,7 @@ $(document).ready(function(){ if ($filter_container.data('filter')) { $('#filter').val($filter_container.data('filter')); } + }); @@ -459,8 +472,8 @@ $(document).ready(function(){ [% ELSE %] [% rule.id | html %] - [% rule.module | html %] - [% rule.filter | html %] + [% rule.module | html %] + [% rule.filter | html %] [% rule.tag | html %] [% IF rule.add %]Add[% ELSE %]Skip[% END %] -- 2.11.0