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

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Nick Clemens 2020-11-12 16:16:42 +00:00 committed by Jonathan Druart
parent 02d1503420
commit bf7a645cbe
2 changed files with 3 additions and 3 deletions

View file

@ -518,14 +518,14 @@ sub BiblioAutoLink {
my $linker = $linker_module->new( my $linker = $linker_module->new(
{ 'options' => C4::Context->preference("LinkerOptions") } ); { 'options' => C4::Context->preference("LinkerOptions") } );
my ( $headings_changed, $results ) = 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 # By default we probably don't want to relink things when cataloging
return $headings_changed, $results; return $headings_changed, $results;
} }
=head2 LinkBibHeadingsToAuthorities =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 Links bib headings to authority records by checking
each authority-controlled field in the C<MARC::Record> each authority-controlled field in the C<MARC::Record>

View file

@ -266,7 +266,7 @@ function updateHeadingLinks(links) {
var tag_subfield_line = $('.subfield_line[id^=subfield' + heading.tag + '9]').eq(tag_index); var tag_subfield_line = $('.subfield_line[id^=subfield' + heading.tag + '9]').eq(tag_index);
if( tag_subfield_line.length < 1 ){ return; } 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 // Delete the old status if one exists
tag_subfield_line.children('.subfield_status').remove(); tag_subfield_line.children('.subfield_status').remove();