From b084bd374cdb22c5e381c296dc9363a88b35ed17 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Tue, 25 Jun 2024 21:12:39 +0000 Subject: [PATCH] Bug 25387: (QA follow-up) Tidy Signed-off-by: Nick Clemens Signed-off-by: Katrin Fischer (cherry picked from commit 4c677600f2a3f8b019d54676dcd95faac1784532) Signed-off-by: Lucas Gass (cherry picked from commit 39449c76c46325391e20a169d595094554c8c4a8) Signed-off-by: Fridolin Somers Signed-off-by: wainuiwitikapark --- authorities/merge.pl | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/authorities/merge.pl b/authorities/merge.pl index 37b03fbe7e..607f2c2665 100755 --- a/authorities/merge.pl +++ b/authorities/merge.pl @@ -157,37 +157,37 @@ else { } # Getting frameworktext - my $frameworktext1 = Koha::Authority::Types->find( $recordObj1->authtypecode ); - my $frameworktext2 = Koha::Authority::Types->find( $recordObj2->authtypecode ); - my $frameworktextdestination = Koha::Authority::Types->find( $framework ); + my $frameworktext1 = Koha::Authority::Types->find( $recordObj1->authtypecode ); + my $frameworktext2 = Koha::Authority::Types->find( $recordObj2->authtypecode ); + my $frameworktextdestination = Koha::Authority::Types->find($framework); # Creating a loop for display my @records = ( { - recordid => $mergereference, - record => $recordObj1->record, + recordid => $mergereference, + record => $recordObj1->record, frameworkcode => $recordObj1->authtypecode, frameworktext => $frameworktext1->authtypetext, - display => $recordObj1->createMergeHash($tagslib), - reference => 1, + display => $recordObj1->createMergeHash($tagslib), + reference => 1, }, { - recordid => $notreference, - record => $recordObj2->record, + recordid => $notreference, + record => $recordObj2->record, frameworkcode => $recordObj2->authtypecode, frameworktext => $frameworktext2->authtypetext, - display => $recordObj2->createMergeHash($tagslib), + display => $recordObj2->createMergeHash($tagslib), }, ); # Parameters $template->param( - recordid1 => $mergereference, - recordid2 => $notreference, - records => \@records, - framework => $framework, - frameworktext => $frameworktextdestination->authtypetext, + recordid1 => $mergereference, + recordid2 => $notreference, + records => \@records, + framework => $framework, + frameworktext => $frameworktextdestination->authtypetext, multipleauthtypes => ( $recordObj1->authtypecode ne $recordObj2->authtypecode ) ? 1 : 0, ); } -- 2.39.5