Attachment 168100 Details for Bug 25387 – Bug 25387: (QA follow-up) Tidy

[patch] Bug 25387: (QA follow-up) Tidy

Bug-25387-QA-follow-up-Tidy.patch (text/plain), 3.10 KB, created by Nick Clemens (kidclamp) on 2024-06-25 21:15:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Clemens (kidclamp)

Created: 2024-06-25 21:15:22 UTC

Size: 3.10 KB

patch

obsolete

>From 2b2b6a3e20b6177cd9f98eb5b63c96f15bd18882 Mon Sep 17 00:00:00 2001
>From: Nick Clemens <nick@bywatersolutions.com>
>Date: Tue, 25 Jun 2024 21:12:39 +0000
>Subject: [PATCH] Bug 25387: (QA follow-up) Tidy
>
>Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
>---
> authorities/merge.pl | 30 +++++++++++++++---------------
> 1 file changed, 15 insertions(+), 15 deletions(-)
>
>diff --git a/authorities/merge.pl b/authorities/merge.pl
>index 1e34e9f7be3..d3208a8fa2b 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.2

Actions: View | Diff | Splinter Review

Attachments on bug 25387: 126415 | 126588 | 167226 | 167227 | 167258 | 168099 | 168100