From ecdfb0bf9728dc21ac988d66a5033ee95caf3352 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 2 May 2023 16:26:45 +0200 Subject: [PATCH] Bug 33335: Use To.json to serialize --- admin/marc-overlay-rules.pl | 13 +++++++++---- .../prog/en/modules/admin/marc-overlay-rules.tt | 10 ++++------ 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/admin/marc-overlay-rules.pl b/admin/marc-overlay-rules.pl index 05a5bbe5817..3faa2249551 100755 --- a/admin/marc-overlay-rules.pl +++ b/admin/marc-overlay-rules.pl @@ -132,11 +132,16 @@ elsif ($op eq 'doedit' || $op eq 'add') { } } -my $categorycodes = Koha::Patron::Categories->search_with_library_limits({}, {order_by => ['description']}); +my $categories = { + map { $_->categorycode => $_->description } + Koha::Patron::Categories->search_with_library_limits( {}, + { order_by => ['description'] } )->as_list +}; + $template->param( - rules => $rules, - categorycodes => $categorycodes, - messages => $errors + rules => $rules, + categories => $categories, + messages => $errors ); output_html_with_http_headers $input, $cookie, $template->output; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt index 898a4cac02f..b8ed8ccde11 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt @@ -1,4 +1,6 @@ [% USE raw %] +[% USE To %] +[% USE Categories %] [% USE Asset %] [% SET footerjs = 1 %] [% USE Koha %] @@ -454,11 +456,7 @@ } }); - var $category = {}; - - [% FOR categorycode IN categorycodes %] - $category["[% categorycode.categorycode %]"] = "[% categorycode.description | html %]"; - [% END %] + var categories = [% To.json( categories ) | $raw %]; var module_filter_options = { source: { @@ -471,7 +469,7 @@ import_lexile: _("import_lexile.pl") }, - categorycode: $category + categorycode: categories, }; //Kind of hack: Replace filter value with label when one exist -- 2.25.1