Attachment 94416 Details for Bug 23844 – Bug 23844: Check if field defined in framework and specify 'Default' for framework

[patch] Bug 23844: Check if field defined in framework and specify 'Default' for framework

Bug-23844-Check-if-field-defined-in-framework-and-.patch (text/plain), 3.17 KB, created by Nick Clemens (kidclamp) on 2019-10-18 18:28:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Clemens (kidclamp)

Created: 2019-10-18 18:28:01 UTC

Size: 3.17 KB

patch

obsolete

>From e04b5d4f4f95b89cae30bb26492c59c3c9028485 Mon Sep 17 00:00:00 2001
>From: Nick <nick@bywatersolutions.com>
>Date: Fri, 18 Oct 2019 18:26:38 +0000
>Subject: [PATCH] Bug 23844: Check if field defined in framework and specify
> 'Default' for framework
>
>To test:
>1 - Go to Cataloguing
>2 - New from Z3950
>3 - Find an import a record
>4 - Check the plack logs:
>Use of uninitialized value in string ne at /kohadevbox/koha/cataloguing/addbiblio.pl line 565.
>Use of uninitialized value in string ne at /kohadevbox/koha/cataloguing/addbiblio.pl line 580.
>Use of uninitialized value $frameworkcode in string eq at /kohadevbox/koha/cataloguing/addbiblio.pl line 711.
>Use of uninitialized value $frameworkcode in string eq at /kohadevbox/koha/cataloguing/addbiblio.pl line 715.
>Use of uninitialized value $frameworkcode in string eq at /kohadevbox/koha/cataloguing/addbiblio.pl line 734.
>5 - Apply patch
>6 - Repeat
>7 - No new errors
>8 - Confirm selecting 'Default' from 'New from Z3950' dropdown also generates no errors
>---
> cataloguing/addbiblio.pl                                        | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl
>index 00b250190a..b2718214bc 100755
>--- a/cataloguing/addbiblio.pl
>+++ b/cataloguing/addbiblio.pl
>@@ -559,7 +559,7 @@ sub build_tabs {
>                             my $subfield = $subfields[$subfieldcount][0];
>                             my $value    = $subfields[$subfieldcount][1];
>                             next if ( length $subfield != 1 );
>-                            next if ( $tagslib->{$tag}->{$subfield}->{tab} ne $tabloop );
>+                            next if ( !defined $tagslib->{$tag}->{$subfield} || $tagslib->{$tag}->{$subfield}->{tab} ne $tabloop );
>                             push(
>                                 @subfields_data,
>                                 &create_input(
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
>index 90f80bf235..100cabdfb0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
>@@ -37,7 +37,7 @@
>                                     <span class="caret"></span>
>                                 </button>
>                                 <ul class="dropdown-menu">
>-                                    <li class="z3950searchFw"><a href="#">Default framework</a></li>
>+                                    <li id="Default" class="z3950searchFw"><a href="#">Default framework</a></li>
>                                     [% FOREACH framework IN frameworks %]
>                                         <li id="[% framework.frameworkcode | html %]" class="z3950searchFw"><a href="#">[% framework.frameworktext | html %]</a></li>
>                                     [% END %]
>@@ -227,7 +227,7 @@
>             $("input[name=q]:eq(0)").focus();
> 
>             $("#z3950search").click(function(){
>-                PopupZ3950("");
>+                PopupZ3950("Default");
>                 return false;
>             });
> 
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 23844: 94416 | 97585 | 98446