Attachment 113568 Details for Bug 11299 – Bug 11299: (follow-up) Rebase on recent changes

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

Bug-11299-follow-up-Rebase-on-recent-changes.patch (text/plain), 2.32 KB, created by Nick Clemens (kidclamp) on 2020-11-12 16:18:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Clemens (kidclamp)

Created: 2020-11-12 16:18:08 UTC

Size: 2.32 KB

patch

obsolete

>From 91dbf62f5cab763e5a896b630e115daa5f209d42 Mon Sep 17 00:00:00 2001
>From: Nick Clemens <nick@bywatersolutions.com>
>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 3ee97ec800..7e50775abc 100644
>--- a/C4/Biblio.pm
>+++ b/C4/Biblio.pm
>@@ -454,14 +454,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 f92e4d69bc..e1affbff77 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

Actions: View | Diff | Splinter Review

Attachments on bug 11299: 23146 | 26715 | 33074 | 37912 | 37913 | 37972 | 38737 | 39477 | 39478 | 39479 | 40831 | 41229 | 45218 | 56440 | 56508 | 56509 | 58307 | 60998 | 63311 | 63312 | 63313 | 64075 | 67162 | 67708 | 67709 | 67710 | 67712 | 67713 | 67714 | 67824 | 67825 | 67826 | 67827 | 67828 | 67829 | 79385 | 79386 | 79387 | 79388 | 79389 | 79390 | 79391 | 79392 | 79393 | 79394 | 79395 | 79396 | 79397 | 79398 | 79399 | 79447 | 79448 | 79449 | 79450 | 79451 | 79452 | 79545 | 94818 | 95126 | 95152 | 98571 | 98572 | 99249 | 108091 | 108309 | 108310 | 108396 | 108552 | 108834 | 108835 | 109062 | 109063 | 109069 | 109181 | 110553 | 110554 | 110555 | 110556 | 110557 | 110568 | 110569 | 110570 | 110571 | 110572 | 111706 | 111707 | 111708 | 111709 | 111710 | 112125 | 112126 | 112127 | 112128 | 112129 | 112130 | 112131 | 112132 | 112133 | 112134 | 112135 | 113562 | 113563 | 113564 | 113565 | 113566 | 113567 | 113568 | 114803 | 114924 | 114925 | 114926 | 114927 | 114928 | 114929 | 114930 | 114931 | 114932