From b943e197af46a5c2d79bf0d604114091f1b7c9b8 Mon Sep 17 00:00:00 2001 From: Julian Maurice Date: Thu, 16 Jun 2022 10:34:30 +0200 Subject: [PATCH] Bug 30975: Fix framework plugins not working on cloned fields/subfields Since bug 29155 (Upgrade jquery version to 3.6.0) framework plugins do not work on a cloned field/subfield. That is because we rely on jQuery's `.data('events')` to clone event handlers to the cloned elements, and that was removed in jQuery 1.8.0 (I did not confirm but it's possible it continued to work after that thanks to jQuery Migrate) It is apparently still possible to access these event handlers by using `jQuery._data(element, "events")` but here's what jQuery 1.8.0 release notes says about it: "this is not a supported public interface; the actual data structures may change incompatibly from version to version." So we should not rely on it. Instead, what this patch does is use event delegation [1]. Events are bound to a parent container, so when elements are added dynamically inside that container, we don't need to re-attach event handlers manually This patch also comes with a bit of cleanup, and introduce "breaking changes" (they are breaking changes only if you happen to have custom framework plugins): 1) Only 'click', 'focus' and 'blur' events are listened to now. They are the only ones we use, and the only ones we actually need. Events removed: change, mouseover, mouseout, mousedown, mouseup, mousemove, keydown, keypress, keyup. If you ever need one of those, you can still add event listeners in the 'focus' event handler, and remove them in the 'blur' event handler 2) Event handlers now takes a single parameter that is an Event object It just makes the code a lot less complicated. All framework plugins have been updated 3) Event handlers do not pollute the global scope anymore [1] https://learn.jquery.com/events/event-delegation/ Test plan: - Go to every page that has a MARC editor and verify that plugins still work. This includes addbiblio.pl, additem.pl, authorities.pl, neworderempty.pl, orderreceive.pl - Test plugins that use 'focus' event (for instance barcode.pl), 'blur' event (callnumber.pl) and 'click' event (almost all the others) - Test that plugins work on cloned fields/subfields --- C4/Items.pm | 2 +- Koha/FrameworkPlugin.pm | 84 ++-------------- Koha/UI/Form/Builder/Item.pm | 1 + authorities/authorities.pl | 1 + cataloguing/value_builder/EXAMPLE.pl | 26 +---- cataloguing/value_builder/barcode.pl | 12 ++- cataloguing/value_builder/barcode_manual.pl | 3 +- cataloguing/value_builder/callnumber-KU.pl | 4 +- cataloguing/value_builder/callnumber.pl | 4 +- cataloguing/value_builder/cn_browser.pl | 4 +- cataloguing/value_builder/dateaccessioned.pl | 1 - cataloguing/value_builder/marc21_field_005.pl | 1 - cataloguing/value_builder/stocknumber.pl | 9 +- cataloguing/value_builder/stocknumberAV.pl | 6 +- cataloguing/value_builder/stocknumberam123.pl | 4 +- .../value_builder/unimarc_field_010.pl | 4 +- .../value_builder/unimarc_field_100.pl | 3 +- .../unimarc_field_100_authorities.pl | 3 +- .../value_builder/unimarc_field_105.pl | 6 +- .../value_builder/unimarc_field_106.pl | 6 +- .../value_builder/unimarc_field_110.pl | 6 +- .../value_builder/unimarc_field_115a.pl | 5 +- .../value_builder/unimarc_field_115b.pl | 6 +- .../value_builder/unimarc_field_116.pl | 6 +- .../value_builder/unimarc_field_117.pl | 6 +- .../value_builder/unimarc_field_120.pl | 6 +- .../value_builder/unimarc_field_121a.pl | 6 +- .../value_builder/unimarc_field_121b.pl | 6 +- .../value_builder/unimarc_field_122.pl | 6 +- .../value_builder/unimarc_field_123a.pl | 6 +- .../value_builder/unimarc_field_123d.pl | 6 +- .../value_builder/unimarc_field_123e.pl | 6 +- .../value_builder/unimarc_field_123f.pl | 6 +- .../value_builder/unimarc_field_123g.pl | 6 +- .../value_builder/unimarc_field_123i.pl | 6 +- .../value_builder/unimarc_field_123j.pl | 6 +- .../value_builder/unimarc_field_124.pl | 6 +- .../value_builder/unimarc_field_124a.pl | 6 +- .../value_builder/unimarc_field_124b.pl | 6 +- .../value_builder/unimarc_field_124c.pl | 6 +- .../value_builder/unimarc_field_124d.pl | 6 +- .../value_builder/unimarc_field_124e.pl | 6 +- .../value_builder/unimarc_field_124f.pl | 6 +- .../value_builder/unimarc_field_124g.pl | 6 +- .../value_builder/unimarc_field_125.pl | 6 +- .../value_builder/unimarc_field_125a.pl | 6 +- .../value_builder/unimarc_field_125b.pl | 6 +- .../value_builder/unimarc_field_126.pl | 6 +- .../value_builder/unimarc_field_126a.pl | 6 +- .../value_builder/unimarc_field_126b.pl | 6 +- .../value_builder/unimarc_field_127.pl | 6 +- .../value_builder/unimarc_field_128a.pl | 6 +- .../value_builder/unimarc_field_128b.pl | 7 +- .../value_builder/unimarc_field_128c.pl | 6 +- .../value_builder/unimarc_field_130.pl | 6 +- .../value_builder/unimarc_field_135a.pl | 6 +- .../value_builder/unimarc_field_140.pl | 6 +- .../value_builder/unimarc_field_141.pl | 6 +- .../value_builder/unimarc_field_146a.pl | 1 - .../value_builder/unimarc_field_146h.pl | 1 - .../value_builder/unimarc_field_146i.pl | 1 - .../value_builder/unimarc_field_210c.pl | 6 +- .../value_builder/unimarc_field_210c_bis.pl | 4 +- .../value_builder/unimarc_field_225a.pl | 6 +- .../value_builder/unimarc_field_225a_bis.pl | 4 +- .../value_builder/unimarc_field_4XX.pl | 6 +- .../value_builder/unimarc_field_686a.pl | 6 +- .../value_builder/unimarc_field_700-4.pl | 6 +- cataloguing/value_builder/unimarc_leader.pl | 11 +-- .../unimarc_leader_authorities.pl | 8 +- cataloguing/value_builder/upload.pl | 1 - .../prog/en/includes/html_helpers.inc | 6 +- .../prog/en/modules/acqui/neworderempty.tt | 2 +- .../prog/en/modules/acqui/orderreceive.tt | 2 +- .../en/modules/authorities/authorities.tt | 4 +- .../prog/en/modules/cataloguing/addbiblio.tt | 8 +- .../prog/en/modules/cataloguing/additem.tt | 2 +- koha-tmpl/intranet-tmpl/prog/js/additem.js | 14 --- koha-tmpl/intranet-tmpl/prog/js/cataloging.js | 97 ++++++++----------- 79 files changed, 249 insertions(+), 359 deletions(-) diff --git a/C4/Items.pm b/C4/Items.pm index 301fb51ebe..f4f6d51f82 100644 --- a/C4/Items.pm +++ b/C4/Items.pm @@ -1807,7 +1807,7 @@ sub PrepareItemrecordDisplay { my $tab= $plugin->noclick? '-1': ''; my $class= $plugin->noclick? ' disabled': ''; my $title= $plugin->noclick? 'No popup': 'Tag editor'; - $subfield_data{marc_value} = qq[...\n].$plugin->javascript; + $subfield_data{marc_value} = qq[...\n].$plugin->javascript; } else { warn $plugin->errstr; $subfield_data{marc_value} = qq(); # supply default input form diff --git a/Koha/FrameworkPlugin.pm b/Koha/FrameworkPlugin.pm index 2331bfa6b3..7a4d5b859a 100644 --- a/Koha/FrameworkPlugin.pm +++ b/Koha/FrameworkPlugin.pm @@ -297,94 +297,24 @@ sub _process_javascript { $script =~ s/\]*\>\s*(\/\/\\s*)?\<\/script\>//s; - my $id = $params->{id}//''; - my $bind = ''; my $clickfound = 0; - my @events = qw|click focus blur change mouseover mouseout mousedown - mouseup mousemove keydown keypress keyup|; + my @events = qw|click focus blur|; foreach my $ev ( @events ) { my $scan = $ev eq 'click' && $self->{oldschool}? 'clic': $ev; - if( $script =~ /function\s+($scan\w+)\s*\(([^\)]*)\)/is ) { - my ( $bl, $sl ) = $self->_add_binding( $1, $2, $ev, $id ); - $script .= $sl; - $bind .= $bl; + if( $script =~ /function\s+($scan\w+)\s*\(/is ) { + my $function_name = $1; + $script .= sprintf('registerFrameworkPluginHandler("%s", "%s", %s);', $self->name, $ev, $function_name); $clickfound = 1 if $ev eq 'click'; } } - if( !$clickfound ) { # make buttonDot do nothing - my ( $bl ) = $self->_add_binding( 'noclick', '', 'click', $id ); - $bind .= $bl; - } $self->{noclick} = !$clickfound; - $self->{javascript}= _merge_script( $id, $script, $bind ); -} - -sub _add_binding { -# adds some jQuery code for event binding: -# $bind contains lines for the actual event binding: .click, .focus, etc. -# $script contains function definitions (if needed) - my ( $self, $fname, $pars, $ev, $id ) = @_; - my ( $bind, $script ); - my $ctl= $ev eq 'click'? 'buttonDot_'.$id: $id; - #click event applies to buttonDot - - if( $pars =~ /^(e|ev|event)$/i ) { # new style event handler assumed - $bind= qq| \$("#$ctl").$ev(\{id: '$id'\}, $fname);\n|; - $script=''; - } elsif( $fname eq 'noclick' ) { # no click: return false, no scroll - $bind= qq| \$("#$ctl").$ev(function () { return false; });\n|; - $script=''; - } else { # add real event handler calling the function found - $bind=qq| \$("#$ctl").$ev(\{id: '$id'\}, ${fname}_handler);\n|; - $script = $self->_add_handler( $ev, $fname ); - } - return ( $bind, $script ); -} - -sub _add_handler { -# adds a handler with event parameter -# event.data.id is passed to the plugin function in parameters -# for the click event we always return false to prevent scrolling - my ( $self, $ev, $fname ) = @_; - my $first= $self->_first_item_par( $ev ); - my $prefix= $ev eq 'click'? '': 'return '; - my $suffix= $ev eq 'click'? "\n return false;": ''; - return <{item_style} && $self->{oldschool} && - $event=~/focus|blur|change/ ) { - return qq/'0',/; - } - return ''; -} - -sub _merge_script { -# Combine script and event bindings, enclosed in script tags. -# The BindEvents function is added to easily repeat event binding; -# this is used in additem.js for dynamically created item blocks. - my ( $id, $script, $bind ) = @_; - chomp ($script, $bind); - return <{javascript} = < +\$(document).ready(function () { $script -function BindEvents$id() { -$bind -} -\$(document).ready(function() { - BindEvents$id(); }); -HERE +JS } =head1 AUTHOR diff --git a/Koha/UI/Form/Builder/Item.pm b/Koha/UI/Form/Builder/Item.pm index 5efe6ed796..506f67bdbe 100644 --- a/Koha/UI/Form/Builder/Item.pm +++ b/Koha/UI/Form/Builder/Item.pm @@ -328,6 +328,7 @@ sub generate_subfield_form { class => $class, nopopup => $plugin->noclick, javascript => $plugin->javascript, + plugin => $plugin->name, }; } else { diff --git a/authorities/authorities.pl b/authorities/authorities.pl index e4063d9d94..cd9449dd0e 100755 --- a/authorities/authorities.pl +++ b/authorities/authorities.pl @@ -206,6 +206,7 @@ sub create_input { maxlength => $max_length, javascript => $plugin->javascript, noclick => $plugin->noclick, + plugin => $plugin->name, }; } else { # warn and supply default field warn $plugin->errstr; diff --git a/cataloguing/value_builder/EXAMPLE.pl b/cataloguing/value_builder/EXAMPLE.pl index 691e69f8e2..31319494e1 100755 --- a/cataloguing/value_builder/EXAMPLE.pl +++ b/cataloguing/value_builder/EXAMPLE.pl @@ -65,37 +65,19 @@ my $builder= sub { |; }; diff --git a/cataloguing/value_builder/barcode.pl b/cataloguing/value_builder/barcode.pl index 8fcd45beae..f9b83a44e1 100755 --- a/cataloguing/value_builder/barcode.pl +++ b/cataloguing/value_builder/barcode.pl @@ -86,14 +86,16 @@ END_OF_JS my $js = < - -function Focus$function_name(id, force) { +function set_barcode(id, force) { $scr } -function Click$function_name(id) { - Focus$function_name(id, 1); - return false; +function Focus$function_name(event) { + set_barcode(event.data.id, false); +} + +function Click$function_name(event) { + set_barcode(event.data.id, true); } END_OF_JS diff --git a/cataloguing/value_builder/barcode_manual.pl b/cataloguing/value_builder/barcode_manual.pl index d2b7f7a414..5c38c2f926 100755 --- a/cataloguing/value_builder/barcode_manual.pl +++ b/cataloguing/value_builder/barcode_manual.pl @@ -66,7 +66,8 @@ END_OF_JS my $js = < - function Click$function_name(id) { + function Click$function_name(event) { + const id = event.data.id; $scr return false; } diff --git a/cataloguing/value_builder/callnumber-KU.pl b/cataloguing/value_builder/callnumber-KU.pl index 37b7e16d00..75323c49d9 100755 --- a/cataloguing/value_builder/callnumber-KU.pl +++ b/cataloguing/value_builder/callnumber-KU.pl @@ -46,8 +46,8 @@ my $builder = sub { my ( $params ) = @_; my $res=" diff --git a/cataloguing/value_builder/stocknumber.pl b/cataloguing/value_builder/stocknumber.pl index 03dc79de06..39083e1b38 100755 --- a/cataloguing/value_builder/stocknumber.pl +++ b/cataloguing/value_builder/stocknumber.pl @@ -39,15 +39,18 @@ my $builder = sub { my $js = < -function Focus$function_name(id, force) { +function set_stocknumber(id, force) { if (\$('#' + id).val() == '' || force) { \$('#' + id).val('$nextnum'); } } +function Focus$function_name(event) { + set_stocknumber(event.data.id, false); +} + function Click$function_name(event) { - Focus$function_name(event.data.id, 1); - return false; + set_stocknumber(event.data.id, true); } END_OF_JS diff --git a/cataloguing/value_builder/stocknumberAV.pl b/cataloguing/value_builder/stocknumberAV.pl index 793cf1066a..6a99f8f6bd 100755 --- a/cataloguing/value_builder/stocknumberAV.pl +++ b/cataloguing/value_builder/stocknumberAV.pl @@ -47,8 +47,8 @@ my $builder = sub { my ( $params ) = @_; my $res = qq{ diff --git a/cataloguing/value_builder/unimarc_field_106.pl b/cataloguing/value_builder/unimarc_field_106.pl index 7b91dd4410..8be673369b 100755 --- a/cataloguing/value_builder/unimarc_field_106.pl +++ b/cataloguing/value_builder/unimarc_field_106.pl @@ -32,9 +32,9 @@ my ($dbh,$record,$tagslib,$field_number) = @_; my $function_name= "106".(int(rand(100000))+1); my $res=" diff --git a/cataloguing/value_builder/unimarc_field_110.pl b/cataloguing/value_builder/unimarc_field_110.pl index b3e88e2c20..a1b12d40f5 100755 --- a/cataloguing/value_builder/unimarc_field_110.pl +++ b/cataloguing/value_builder/unimarc_field_110.pl @@ -33,9 +33,9 @@ sub plugin_javascript { my ($dbh,$record,$tagslib,$field_number) = @_; my $res=" diff --git a/cataloguing/value_builder/unimarc_field_115a.pl b/cataloguing/value_builder/unimarc_field_115a.pl index fc0223a3e6..f94d9a2f48 100755 --- a/cataloguing/value_builder/unimarc_field_115a.pl +++ b/cataloguing/value_builder/unimarc_field_115a.pl @@ -32,7 +32,8 @@ sub plugin_javascript { my ( $dbh, $record, $tagslib, $field_number ) = @_; my $res = " diff --git a/cataloguing/value_builder/unimarc_field_115b.pl b/cataloguing/value_builder/unimarc_field_115b.pl index 901e73eb3e..ac5ecbb2c7 100755 --- a/cataloguing/value_builder/unimarc_field_115b.pl +++ b/cataloguing/value_builder/unimarc_field_115b.pl @@ -32,9 +32,9 @@ sub plugin_javascript { my ( $dbh, $record, $tagslib, $field_number ) = @_; my $res = " diff --git a/cataloguing/value_builder/unimarc_field_116.pl b/cataloguing/value_builder/unimarc_field_116.pl index 8781a5da2f..1689927de5 100755 --- a/cataloguing/value_builder/unimarc_field_116.pl +++ b/cataloguing/value_builder/unimarc_field_116.pl @@ -32,9 +32,9 @@ sub plugin_javascript { my ( $dbh, $record, $tagslib, $field_number ) = @_; my $res = " diff --git a/cataloguing/value_builder/unimarc_field_117.pl b/cataloguing/value_builder/unimarc_field_117.pl index 9286826145..78b4c1055a 100755 --- a/cataloguing/value_builder/unimarc_field_117.pl +++ b/cataloguing/value_builder/unimarc_field_117.pl @@ -32,9 +32,9 @@ sub plugin_javascript { my ($dbh,$record,$tagslib,$field_number) = @_; my $res=" diff --git a/cataloguing/value_builder/unimarc_field_120.pl b/cataloguing/value_builder/unimarc_field_120.pl index 4c4d06139d..1342e8e4a1 100755 --- a/cataloguing/value_builder/unimarc_field_120.pl +++ b/cataloguing/value_builder/unimarc_field_120.pl @@ -34,9 +34,9 @@ my ($dbh,$record,$tagslib,$field_number) = @_; my $function_name=$field_number; my $res=" diff --git a/cataloguing/value_builder/unimarc_field_121a.pl b/cataloguing/value_builder/unimarc_field_121a.pl index e1967e38ca..423f3cec02 100755 --- a/cataloguing/value_builder/unimarc_field_121a.pl +++ b/cataloguing/value_builder/unimarc_field_121a.pl @@ -33,9 +33,9 @@ my ($dbh,$record,$tagslib,$field_number) = @_; my $function_name= $field_number; my $res=" diff --git a/cataloguing/value_builder/unimarc_field_121b.pl b/cataloguing/value_builder/unimarc_field_121b.pl index bcdc22aac0..84974fca64 100755 --- a/cataloguing/value_builder/unimarc_field_121b.pl +++ b/cataloguing/value_builder/unimarc_field_121b.pl @@ -31,9 +31,9 @@ my ($dbh,$record,$tagslib,$field_number) = @_; my $function_name= $field_number; my $res=" diff --git a/cataloguing/value_builder/unimarc_field_122.pl b/cataloguing/value_builder/unimarc_field_122.pl index ecedc74cc2..9d9175d7e8 100755 --- a/cataloguing/value_builder/unimarc_field_122.pl +++ b/cataloguing/value_builder/unimarc_field_122.pl @@ -31,9 +31,9 @@ my ($dbh,$record,$tagslib,$field_number) = @_; my $function_name= $field_number; my $res=" diff --git a/cataloguing/value_builder/unimarc_field_123a.pl b/cataloguing/value_builder/unimarc_field_123a.pl index 3d3fa4f56f..01e60f98dd 100755 --- a/cataloguing/value_builder/unimarc_field_123a.pl +++ b/cataloguing/value_builder/unimarc_field_123a.pl @@ -31,9 +31,9 @@ my ($dbh,$record,$tagslib,$field_number) = @_; my $function_name= $field_number; my $res=" diff --git a/cataloguing/value_builder/unimarc_field_123d.pl b/cataloguing/value_builder/unimarc_field_123d.pl index 50865fb2eb..db5ff16b61 100755 --- a/cataloguing/value_builder/unimarc_field_123d.pl +++ b/cataloguing/value_builder/unimarc_field_123d.pl @@ -32,9 +32,9 @@ my ($dbh,$record,$tagslib,$field_number) = @_; my $function_name= $field_number; my $res=" diff --git a/cataloguing/value_builder/unimarc_field_123e.pl b/cataloguing/value_builder/unimarc_field_123e.pl index 50865fb2eb..db5ff16b61 100755 --- a/cataloguing/value_builder/unimarc_field_123e.pl +++ b/cataloguing/value_builder/unimarc_field_123e.pl @@ -32,9 +32,9 @@ my ($dbh,$record,$tagslib,$field_number) = @_; my $function_name= $field_number; my $res=" diff --git a/cataloguing/value_builder/unimarc_field_123f.pl b/cataloguing/value_builder/unimarc_field_123f.pl index 4fb190e52a..7c630d956c 100755 --- a/cataloguing/value_builder/unimarc_field_123f.pl +++ b/cataloguing/value_builder/unimarc_field_123f.pl @@ -32,9 +32,9 @@ my ($dbh,$record,$tagslib,$field_number) = @_; my $function_name= $field_number; my $res=" diff --git a/cataloguing/value_builder/unimarc_field_123g.pl b/cataloguing/value_builder/unimarc_field_123g.pl index 50865fb2eb..db5ff16b61 100755 --- a/cataloguing/value_builder/unimarc_field_123g.pl +++ b/cataloguing/value_builder/unimarc_field_123g.pl @@ -32,9 +32,9 @@ my ($dbh,$record,$tagslib,$field_number) = @_; my $function_name= $field_number; my $res=" diff --git a/cataloguing/value_builder/unimarc_field_123i.pl b/cataloguing/value_builder/unimarc_field_123i.pl index a62c23ab37..a05c78f2ab 100755 --- a/cataloguing/value_builder/unimarc_field_123i.pl +++ b/cataloguing/value_builder/unimarc_field_123i.pl @@ -32,9 +32,9 @@ my ($dbh,$record,$tagslib,$field_number) = @_; my $function_name= $field_number; my $res=" diff --git a/cataloguing/value_builder/unimarc_field_123j.pl b/cataloguing/value_builder/unimarc_field_123j.pl index aa2a3c31e0..40c86659fb 100755 --- a/cataloguing/value_builder/unimarc_field_123j.pl +++ b/cataloguing/value_builder/unimarc_field_123j.pl @@ -32,9 +32,9 @@ my ($dbh,$record,$tagslib,$field_number) = @_; my $function_name= $field_number; my $res=" diff --git a/cataloguing/value_builder/unimarc_field_124.pl b/cataloguing/value_builder/unimarc_field_124.pl index 82ab72d4f4..7fa6f4685f 100755 --- a/cataloguing/value_builder/unimarc_field_124.pl +++ b/cataloguing/value_builder/unimarc_field_124.pl @@ -32,9 +32,9 @@ my ($dbh,$record,$tagslib,$field_number) = @_; my $function_name= $field_number; my $res=" diff --git a/cataloguing/value_builder/unimarc_field_124a.pl b/cataloguing/value_builder/unimarc_field_124a.pl index ef2e7dccb7..e23f763b7b 100755 --- a/cataloguing/value_builder/unimarc_field_124a.pl +++ b/cataloguing/value_builder/unimarc_field_124a.pl @@ -32,9 +32,9 @@ my ($dbh,$record,$tagslib,$field_number) = @_; my $function_name= $field_number; my $res=" diff --git a/cataloguing/value_builder/unimarc_field_124b.pl b/cataloguing/value_builder/unimarc_field_124b.pl index 9008ea673c..0aa288d8e6 100755 --- a/cataloguing/value_builder/unimarc_field_124b.pl +++ b/cataloguing/value_builder/unimarc_field_124b.pl @@ -32,9 +32,9 @@ my ($dbh,$record,$tagslib,$field_number) = @_; my $function_name= $field_number; my $res=" diff --git a/cataloguing/value_builder/unimarc_field_124c.pl b/cataloguing/value_builder/unimarc_field_124c.pl index 3433ea9a93..15e5c7aa0c 100755 --- a/cataloguing/value_builder/unimarc_field_124c.pl +++ b/cataloguing/value_builder/unimarc_field_124c.pl @@ -32,9 +32,9 @@ my ($dbh,$record,$tagslib,$field_number) = @_; my $function_name= $field_number; my $res=" diff --git a/cataloguing/value_builder/unimarc_field_124d.pl b/cataloguing/value_builder/unimarc_field_124d.pl index e65d93eaa2..19620e891a 100755 --- a/cataloguing/value_builder/unimarc_field_124d.pl +++ b/cataloguing/value_builder/unimarc_field_124d.pl @@ -32,9 +32,9 @@ my ($dbh,$record,$tagslib,$field_number) = @_; my $function_name= $field_number; my $res=" diff --git a/cataloguing/value_builder/unimarc_field_124e.pl b/cataloguing/value_builder/unimarc_field_124e.pl index 11d1aabfa3..e646f8f5df 100755 --- a/cataloguing/value_builder/unimarc_field_124e.pl +++ b/cataloguing/value_builder/unimarc_field_124e.pl @@ -32,9 +32,9 @@ my ($dbh,$record,$tagslib,$field_number) = @_; my $function_name= $field_number; my $res=" diff --git a/cataloguing/value_builder/unimarc_field_124f.pl b/cataloguing/value_builder/unimarc_field_124f.pl index 96df17be7a..5a7f7a2aa5 100755 --- a/cataloguing/value_builder/unimarc_field_124f.pl +++ b/cataloguing/value_builder/unimarc_field_124f.pl @@ -32,9 +32,9 @@ my ($dbh,$record,$tagslib,$field_number) = @_; my $function_name= $field_number; my $res=" diff --git a/cataloguing/value_builder/unimarc_field_124g.pl b/cataloguing/value_builder/unimarc_field_124g.pl index 4dfe3a7d9f..d7c1879fbe 100755 --- a/cataloguing/value_builder/unimarc_field_124g.pl +++ b/cataloguing/value_builder/unimarc_field_124g.pl @@ -32,9 +32,9 @@ my ($dbh,$record,$tagslib,$field_number) = @_; my $function_name= $field_number; my $res=" diff --git a/cataloguing/value_builder/unimarc_field_125.pl b/cataloguing/value_builder/unimarc_field_125.pl index fa31200861..e1a88a02a6 100755 --- a/cataloguing/value_builder/unimarc_field_125.pl +++ b/cataloguing/value_builder/unimarc_field_125.pl @@ -38,9 +38,9 @@ my ($dbh,$record,$tagslib,$field_number) = @_; my $function_name= $field_number; my $res=" diff --git a/cataloguing/value_builder/unimarc_field_125a.pl b/cataloguing/value_builder/unimarc_field_125a.pl index c4585d7e24..112962422a 100755 --- a/cataloguing/value_builder/unimarc_field_125a.pl +++ b/cataloguing/value_builder/unimarc_field_125a.pl @@ -32,9 +32,9 @@ my ($dbh,$record,$tagslib,$field_number) = @_; my $function_name= $field_number; my $res=" diff --git a/cataloguing/value_builder/unimarc_field_125b.pl b/cataloguing/value_builder/unimarc_field_125b.pl index 2429d3e48b..07fab547a7 100755 --- a/cataloguing/value_builder/unimarc_field_125b.pl +++ b/cataloguing/value_builder/unimarc_field_125b.pl @@ -33,9 +33,9 @@ my ($dbh,$record,$tagslib,$field_number) = @_; my $function_name= $field_number; my $res=" diff --git a/cataloguing/value_builder/unimarc_field_126.pl b/cataloguing/value_builder/unimarc_field_126.pl index 82ab72d4f4..7fa6f4685f 100755 --- a/cataloguing/value_builder/unimarc_field_126.pl +++ b/cataloguing/value_builder/unimarc_field_126.pl @@ -32,9 +32,9 @@ my ($dbh,$record,$tagslib,$field_number) = @_; my $function_name= $field_number; my $res=" diff --git a/cataloguing/value_builder/unimarc_field_126a.pl b/cataloguing/value_builder/unimarc_field_126a.pl index d1cfd84c4c..04abd1aa4d 100755 --- a/cataloguing/value_builder/unimarc_field_126a.pl +++ b/cataloguing/value_builder/unimarc_field_126a.pl @@ -33,9 +33,9 @@ my ($dbh,$record,$tagslib,$field_number) = @_; my $function_name= $field_number; my $res=" diff --git a/cataloguing/value_builder/unimarc_field_126b.pl b/cataloguing/value_builder/unimarc_field_126b.pl index 79778cfe44..a6b0b702b5 100755 --- a/cataloguing/value_builder/unimarc_field_126b.pl +++ b/cataloguing/value_builder/unimarc_field_126b.pl @@ -32,9 +32,9 @@ my ($dbh,$record,$tagslib,$field_number) = @_; my $function_name= $field_number; my $res=" diff --git a/cataloguing/value_builder/unimarc_field_127.pl b/cataloguing/value_builder/unimarc_field_127.pl index 85adba0dad..a5376989e4 100755 --- a/cataloguing/value_builder/unimarc_field_127.pl +++ b/cataloguing/value_builder/unimarc_field_127.pl @@ -32,9 +32,9 @@ my ($dbh,$record,$tagslib,$field_number) = @_; my $function_name= $field_number; my $res=" diff --git a/cataloguing/value_builder/unimarc_field_128a.pl b/cataloguing/value_builder/unimarc_field_128a.pl index 9f235e1e5d..161a21a61c 100755 --- a/cataloguing/value_builder/unimarc_field_128a.pl +++ b/cataloguing/value_builder/unimarc_field_128a.pl @@ -32,9 +32,9 @@ my ($dbh,$record,$tagslib,$field_number) = @_; my $function_name= $field_number; my $res=" diff --git a/cataloguing/value_builder/unimarc_field_128b.pl b/cataloguing/value_builder/unimarc_field_128b.pl index 7d2e215fb8..f989845f1f 100755 --- a/cataloguing/value_builder/unimarc_field_128b.pl +++ b/cataloguing/value_builder/unimarc_field_128b.pl @@ -33,9 +33,10 @@ my ($dbh,$record,$tagslib,$field_number) = @_; my $function_name= $field_number; my $res=" diff --git a/cataloguing/value_builder/unimarc_field_128c.pl b/cataloguing/value_builder/unimarc_field_128c.pl index a0ff9ddd4e..14a3c60ab3 100755 --- a/cataloguing/value_builder/unimarc_field_128c.pl +++ b/cataloguing/value_builder/unimarc_field_128c.pl @@ -32,9 +32,9 @@ my ($dbh,$record,$tagslib,$field_number) = @_; my $function_name= $field_number; my $res=" diff --git a/cataloguing/value_builder/unimarc_field_130.pl b/cataloguing/value_builder/unimarc_field_130.pl index 411eb80a8e..1bcc61ed08 100755 --- a/cataloguing/value_builder/unimarc_field_130.pl +++ b/cataloguing/value_builder/unimarc_field_130.pl @@ -34,9 +34,9 @@ my ($dbh,$record,$tagslib,$field_number) = @_; my $function_name= $field_number; my $res=" diff --git a/cataloguing/value_builder/unimarc_field_135a.pl b/cataloguing/value_builder/unimarc_field_135a.pl index db5bf3c8b0..fd76e82551 100755 --- a/cataloguing/value_builder/unimarc_field_135a.pl +++ b/cataloguing/value_builder/unimarc_field_135a.pl @@ -33,9 +33,9 @@ my ($dbh,$record,$tagslib,$field_number) = @_; my $function_name= $field_number; my $res=" diff --git a/cataloguing/value_builder/unimarc_field_140.pl b/cataloguing/value_builder/unimarc_field_140.pl index a5b303158b..c0ade25a3e 100755 --- a/cataloguing/value_builder/unimarc_field_140.pl +++ b/cataloguing/value_builder/unimarc_field_140.pl @@ -34,9 +34,9 @@ my ($dbh,$record,$tagslib,$field_number) = @_; my $function_name= $field_number; my $res=" diff --git a/cataloguing/value_builder/unimarc_field_141.pl b/cataloguing/value_builder/unimarc_field_141.pl index a7a28ea306..4655847f77 100755 --- a/cataloguing/value_builder/unimarc_field_141.pl +++ b/cataloguing/value_builder/unimarc_field_141.pl @@ -32,9 +32,9 @@ my ($dbh,$record,$tagslib,$field_number) = @_; my $function_name= $field_number; my $res=" diff --git a/cataloguing/value_builder/unimarc_field_146a.pl b/cataloguing/value_builder/unimarc_field_146a.pl index 51f0861325..6d7de2cf7f 100755 --- a/cataloguing/value_builder/unimarc_field_146a.pl +++ b/cataloguing/value_builder/unimarc_field_146a.pl @@ -29,7 +29,6 @@ my $builder = sub { return qq| "; diff --git a/cataloguing/value_builder/unimarc_field_210c_bis.pl b/cataloguing/value_builder/unimarc_field_210c_bis.pl index b558d520d2..9982c86384 100755 --- a/cataloguing/value_builder/unimarc_field_210c_bis.pl +++ b/cataloguing/value_builder/unimarc_field_210c_bis.pl @@ -54,8 +54,8 @@ sub plugin_javascript { "; diff --git a/cataloguing/value_builder/unimarc_field_225a.pl b/cataloguing/value_builder/unimarc_field_225a.pl index 31556ae506..1602ccb371 100755 --- a/cataloguing/value_builder/unimarc_field_225a.pl +++ b/cataloguing/value_builder/unimarc_field_225a.pl @@ -62,7 +62,7 @@ sub plugin_javascript { diff --git a/cataloguing/value_builder/unimarc_field_225a_bis.pl b/cataloguing/value_builder/unimarc_field_225a_bis.pl index 1ca62775a9..16fd59ea33 100755 --- a/cataloguing/value_builder/unimarc_field_225a_bis.pl +++ b/cataloguing/value_builder/unimarc_field_225a_bis.pl @@ -35,8 +35,8 @@ sub plugin_javascript { my $function_name = $field_number; my $res = " "; diff --git a/cataloguing/value_builder/unimarc_field_4XX.pl b/cataloguing/value_builder/unimarc_field_4XX.pl index 2d027101fe..48e42c39e5 100755 --- a/cataloguing/value_builder/unimarc_field_4XX.pl +++ b/cataloguing/value_builder/unimarc_field_4XX.pl @@ -45,9 +45,9 @@ sub plugin_javascript { my $function_name = $field_number; my $res = " diff --git a/cataloguing/value_builder/unimarc_field_686a.pl b/cataloguing/value_builder/unimarc_field_686a.pl index d766b038c6..32f0e26357 100755 --- a/cataloguing/value_builder/unimarc_field_686a.pl +++ b/cataloguing/value_builder/unimarc_field_686a.pl @@ -31,9 +31,9 @@ my ($dbh,$record,$tagslib,$field_number) = @_; my $function_name= $field_number; my $res = " diff --git a/cataloguing/value_builder/unimarc_field_700-4.pl b/cataloguing/value_builder/unimarc_field_700-4.pl index 0d083e9d39..0ebbea2533 100755 --- a/cataloguing/value_builder/unimarc_field_700-4.pl +++ b/cataloguing/value_builder/unimarc_field_700-4.pl @@ -33,9 +33,9 @@ my ($dbh,$record,$tagslib,$field_number) = @_; my $function_name= $field_number; my $res = " diff --git a/cataloguing/value_builder/unimarc_leader.pl b/cataloguing/value_builder/unimarc_leader.pl index 838f5a88f0..a2e3385030 100755 --- a/cataloguing/value_builder/unimarc_leader.pl +++ b/cataloguing/value_builder/unimarc_leader.pl @@ -33,17 +33,16 @@ sub plugin_javascript { my $function_name = $field_number; my $res = " diff --git a/cataloguing/value_builder/unimarc_leader_authorities.pl b/cataloguing/value_builder/unimarc_leader_authorities.pl index 365a44ddbb..f31632e3e2 100755 --- a/cataloguing/value_builder/unimarc_leader_authorities.pl +++ b/cataloguing/value_builder/unimarc_leader_authorities.pl @@ -30,15 +30,15 @@ sub plugin_javascript { my ( $dbh, $record, $tagslib, $field_number ) = @_; my $res = " "; diff --git a/cataloguing/value_builder/upload.pl b/cataloguing/value_builder/upload.pl index 82b9816f62..ac45fb4123 100755 --- a/cataloguing/value_builder/upload.pl +++ b/cataloguing/value_builder/upload.pl @@ -35,7 +35,6 @@ my $builder = sub { return <<"SCRIPT";