From f4f1f999b53039bad607970f5508b14e16f383d1 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Thu, 23 Feb 2017 10:02:57 +0100 Subject: [PATCH] Bug 17380: Merge saves with wrong authtypecode Content-Type: text/plain; charset=utf-8 --- authorities/authorities.pl | 3 ++- authorities/detail.pl | 5 +++-- koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/authorities/authorities.pl b/authorities/authorities.pl index 1e49d96..b1bff93 100755 --- a/authorities/authorities.pl +++ b/authorities/authorities.pl @@ -662,12 +662,13 @@ if ($op eq "duplicate") my $authority_types = Koha::Authority::Types->search( {}, { order_by => ['authtypetext'] } ); +my $type = $authority_types->find($authtypecode); $template->param( authority_types => $authority_types, authtypecode => $authtypecode, authid => $authid, linkid => $linkid, - authtypetext => $authority_types->find($authtypecode)->authtypetext, + authtypetext => $type ? $type->authtypetext : "", hide_marc => C4::Context->preference('hide_marc'), ); output_html_with_http_headers $input, $cookie, $template->output; diff --git a/authorities/detail.pl b/authorities/detail.pl index 1ba280d..5fe0f25 100755 --- a/authorities/detail.pl +++ b/authorities/detail.pl @@ -208,15 +208,16 @@ my $biblio_fields; while (my ($tagfield) = $sth->fetchrow) { $biblio_fields.= $tagfield."9,"; } -chop $biblio_fields; +chop $biblio_fields if $biblio_fields; build_tabs ($template, $record, $dbh,"",$query); +my $type = $authority_types->find($authtypecode); $template->param( authid => $authid, count => $count, biblio_fields => $biblio_fields, - authtypetext => $authority_types->find($authtypecode)->authtypetext, + authtypetext => $type ? $type->authtypetext: "", authtypecode => $authtypecode, authority_types => $authority_types, ); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt index c8fe357..f205e8e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt @@ -90,7 +90,7 @@ function changeFramework(fw) { [% IF frameworkselect %]