From 5e159bf99bd8a066d23ff2b831dfea1090d502da Mon Sep 17 00:00:00 2001 From: Stefano Bargioni Date: Tue, 11 Mar 2014 10:22:12 +0100 Subject: [PATCH 4/4] [8064] Little fix for 003, 005, 008 in MARC21 I found a little bug in the patch. Subfield '@' of tags 003, 005, 008 in MARC21 were not correctly handled by function check_mandatory() in merge.tt. I fixed the problem. In my opinion, the patch can be signed off. --- koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt index c824995..847b2b6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt @@ -34,7 +34,8 @@ div#result { margin-top: 1em; } } for (subfieldcode in tagslib[tag]) { if (subfieldcode == 'lib' || subfieldcode == 'mandatory' - || subfieldcode == 'repeatable' || subfieldcode == 'tab') { + || subfieldcode == 'repeatable' || subfieldcode == 'tab' + || subfieldcode == '@') { continue; } if (tagslib[tag][subfieldcode].mandatory == 1 && tagslib[tag][subfieldcode].tab >= 0) { -- 1.7.10.4