From 407d1424a7fc703a2d1dfba26f1fb3187e9851d3 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Thu, 12 Nov 2020 16:16:42 +0000 Subject: [PATCH] Bug 11299: (follow-up) Rebase on recent changes --- C4/Biblio.pm | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/C4/Biblio.pm b/C4/Biblio.pm index d6239a2046..f775eac09a 100644 --- a/C4/Biblio.pm +++ b/C4/Biblio.pm @@ -518,14 +518,14 @@ sub BiblioAutoLink { my $linker = $linker_module->new( { 'options' => C4::Context->preference("LinkerOptions") } ); my ( $headings_changed, $results ) = - LinkBibHeadingsToAuthorities( $linker, $record, $frameworkcode, C4::Context->preference("CatalogModuleRelink") || '', $verbose ); + LinkBibHeadingsToAuthorities( $linker, $record, $frameworkcode, C4::Context->preference("CatalogModuleRelink") || '', undef, $verbose ); # By default we probably don't want to relink things when cataloging return $headings_changed, $results; } =head2 LinkBibHeadingsToAuthorities - my $num_headings_changed, %results = LinkBibHeadingsToAuthorities($linker, $marc, $frameworkcode, [$allowrelink, $verbose]); + my $num_headings_changed, %results = LinkBibHeadingsToAuthorities($linker, $marc, $frameworkcode, [$allowrelink, $tagtolink, $verbose]); Links bib headings to authority records by checking each authority-controlled field in the C diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt index a76c73ac57..2b5b8ee2fd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt @@ -266,7 +266,7 @@ function updateHeadingLinks(links) { var tag_subfield_line = $('.subfield_line[id^=subfield' + heading.tag + '9]').eq(tag_index); if( tag_subfield_line.length < 1 ){ return; } - var subfield = tag_subfield_line.children('.input_marceditor').eq(0); + var subfield = tag_subfield_line.find('.input_marceditor').eq(0); // Delete the old status if one exists tag_subfield_line.children('.subfield_status').remove(); -- 2.11.0