From 8b3bb800dd4fcf3107ae261ac5edeb634c6ade9e Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 24 Jan 2012 10:44:11 -0500 Subject: [PATCH] Bug 6210 - Follow up, Choose framework on merge - Adding subtitle to the display of titles to be merged - Adding a link to preview the MARC record of titles to be merged - Fixing up markup of form to improve appearance - Correcting breadcrumbs Signed-off-by: Nicole C. Engard Signed-off-by: Paul Poulain (cherry picked from commit 049ac6e2a7182a65cc83cea352ab377c3bec6924) Signed-off-by: Chris Nighswonger --- cataloguing/merge.pl | 11 ++++- .../prog/en/modules/cataloguing/merge.tt | 44 ++++++++----------- 2 files changed, 29 insertions(+), 26 deletions(-) diff --git a/cataloguing/merge.pl b/cataloguing/merge.pl index 59b1d028c2..020001d010 100755 --- a/cataloguing/merge.pl +++ b/cataloguing/merge.pl @@ -127,12 +127,19 @@ if ($merge) { } else { my $data1 = GetBiblioData($biblionumber[0]); + my $record1 = GetMarcBiblio($biblionumber[0]); + my $data2 = GetBiblioData($biblionumber[1]); + my $record2 = GetMarcBiblio($biblionumber[1]); # Checks if both records use the same framework my $frameworkcode1 = &GetFrameworkCode($biblionumber[0]); my $frameworkcode2 = &GetFrameworkCode($biblionumber[1]); + + my $subtitle1 = GetRecordValue('subtitle', $record1, $frameworkcode1); + my $subtitle2 = GetRecordValue('subtitle', $record2, $frameworkcode1); + if ($mergereference) { my $framework; @@ -170,7 +177,9 @@ if ($merge) { biblio1 => $biblionumber[0], biblio2 => $biblionumber[1], title1 => $data1->{'title'}, - title2 => $data2->{'title'} + subtitle1 => $subtitle1, + title2 => $data2->{'title'}, + subtitle2 => $subtitle2 ); if ($frameworkcode1 ne $frameworkcode2) { my $frameworks = getframeworks; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt index 5a48385b03..9235fdd08c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt @@ -1,5 +1,6 @@ [% INCLUDE 'doc-head-open.inc' %] Koha › Cataloging › Merging records +[% INCLUDE 'greybox.inc' %] [% INCLUDE 'doc-head-close.inc' %]