From 717dc940fa7424adb564284da7923bb62ecec1b5 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Wed, 31 Oct 2018 11:50:59 -0300 Subject: [PATCH] Bug 21740: Show @ when editing fixed-length fields on bibliographic frameworks This is a consistency issue: we store '@' as the subfield for fixed-lenght fields, yet on editing '_' is displayed (on the form and the tab). This was probably done to avoid URI encoding problems in the past. This patch restores the '@' everywhere. To test: - Open the MARC structure for any bibliographic MARC framework - Choose Actions > Subfields on any fixed-length field => ERROR: Notice the tab has an underscore (_) and the subfield code is '_' as well. - Cancel => SUCCESS: '@' is displayed on the list - Apply this patch - Restart all the things: $ restart_all - Choose Actions > Subfields on any fixed-length field => SUCCESS: '@' is displayed in the tab title, and on the 'Subfield code' form field. - Save some changes => SUCCESS: Things work correctly. - Sign off :-D Signed-off-by: Pierre-Marc Thibault Signed-off-by: Devinim Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit e520d699109958712212ead8b8935a63402e5b37) Signed-off-by: Martin Renvoize (cherry picked from commit fc04b4b1bc0ee1fb423168e62ca6af9a207ac508) Signed-off-by: Fridolin Somers --- admin/marc_subfields_structure.pl | 3 +-- .../prog/en/modules/admin/marc_subfields_structure.tt | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/admin/marc_subfields_structure.pl b/admin/marc_subfields_structure.pl index 077a58b40e..4f2fdd270c 100755 --- a/admin/marc_subfields_structure.pl +++ b/admin/marc_subfields_structure.pl @@ -172,7 +172,7 @@ if ( $op eq 'add_form' ) { $row_data{maxlength} = $data->{maxlength}; $row_data{tab} = $data->{tab}; $row_data{tagsubfield} = $data->{tagsubfield}; - $row_data{subfieldcode} = $data->{'tagsubfield'} eq '@' ? '_' : $data->{'tagsubfield'}; + $row_data{subfieldcode} = $data->{'tagsubfield'}; $row_data{urisubfieldcode} = $row_data{subfieldcode} eq '%' ? 'pct' : $row_data{subfieldcode}; $row_data{liblibrarian} = $data->{'liblibrarian'}; $row_data{libopac} = $data->{'libopac'}; @@ -263,7 +263,6 @@ elsif ( $op eq 'add_validate' ) { my $tagfield = $input->param('tagfield'); my $tagsubfield = $tagsubfield[$i]; $tagsubfield = "@" unless $tagsubfield ne ''; - $tagsubfield = "@" if $tagsubfield eq '_'; my $liblibrarian = $liblibrarian[$i]; my $libopac = $libopac[$i]; my $repeatable = $input->param("repeatable$i") ? 1 : 0; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt index efdac8dbad..0d6964e68f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt @@ -46,10 +46,10 @@