Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 25387: (QA follow-up) Tidy

Browse source 
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit 4c677600f2)
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
This commit is contained in:
Nick Clemens 2024-06-25 21:12:39 +00:00 committed by Lucas Gass
parent 8e7ea9baaf
commit 39449c76c4
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
authorities/merge.pl
View file

@ -157,37 +157,37 @@ else {
} }
# Getting frameworktext # Getting frameworktext
my $frameworktext1 = Koha::Authority::Types->find( $recordObj1->authtypecode ); my $frameworktext1 = Koha::Authority::Types->find( $recordObj1->authtypecode );
my $frameworktext2 = Koha::Authority::Types->find( $recordObj2->authtypecode ); my $frameworktext2 = Koha::Authority::Types->find( $recordObj2->authtypecode );
my $frameworktextdestination = Koha::Authority::Types->find( $framework ); my $frameworktextdestination = Koha::Authority::Types->find($framework);
# Creating a loop for display # Creating a loop for display
my @records = ( my @records = (
{ {
recordid => $mergereference, recordid => $mergereference,
record => $recordObj1->record, record => $recordObj1->record,
frameworkcode => $recordObj1->authtypecode, frameworkcode => $recordObj1->authtypecode,
frameworktext => $frameworktext1->authtypetext, frameworktext => $frameworktext1->authtypetext,
display => $recordObj1->createMergeHash($tagslib), display => $recordObj1->createMergeHash($tagslib),
reference => 1, reference => 1,
}, },
{ {
recordid => $notreference, recordid => $notreference,
record => $recordObj2->record, record => $recordObj2->record,
frameworkcode => $recordObj2->authtypecode, frameworkcode => $recordObj2->authtypecode,
frameworktext => $frameworktext2->authtypetext, frameworktext => $frameworktext2->authtypetext,
display => $recordObj2->createMergeHash($tagslib), display => $recordObj2->createMergeHash($tagslib),
}, },
); );
# Parameters # Parameters
$template->param( $template->param(
recordid1 => $mergereference, recordid1 => $mergereference,
recordid2 => $notreference, recordid2 => $notreference,
records => \@records, records => \@records,
framework => $framework, framework => $framework,
frameworktext => $frameworktextdestination->authtypetext, frameworktext => $frameworktextdestination->authtypetext,
multipleauthtypes => ( $recordObj1->authtypecode ne $recordObj2->authtypecode ) ? 1 : 0, multipleauthtypes => ( $recordObj1->authtypecode ne $recordObj2->authtypecode ) ? 1 : 0,
); );
} }