Bug 11299: (follow-up) Rebase on recent changes

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

diff --git a/C4/Biblio.pm b/C4/Biblio.pm
index 0271cdc..e84110c 100644 (file)
--- 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<MARC::Record>

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 a76c73a..2b5b8ee 100644 (file)
--- 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();