Attachment 99316 Details for Bug 24131 – Bug 24131: Handle several descriptions

[patch] Bug 24131: Handle several descriptions

Bug-24131-Handle-several-descriptions.patch (text/plain), 1.86 KB, created by Martin Renvoize (ashimema) on 2020-02-20 14:33:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2020-02-20 14:33:18 UTC

Size: 1.86 KB

patch

obsolete

>From b1f8896258141fc12df5702272cb7231eeedab34 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Thu, 6 Feb 2020 13:28:15 +0100
>Subject: [PATCH] Bug 24131: Handle several descriptions
>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> installer/data/mysql/updatedatabase.pl | 21 ++++++++++++++++++---
> 1 file changed, 18 insertions(+), 3 deletions(-)
>
>diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
>index a1d1e19dba..2742e6c8f1 100755
>--- a/installer/data/mysql/updatedatabase.pl
>+++ b/installer/data/mysql/updatedatabase.pl
>@@ -20974,16 +20974,31 @@ sub SetVersion {
> 
> sub NewVersion {
>     my ( $DBversion, $bug_number, $descriptions ) = @_;
>+
>     SetVersion($DBversion);
>+
>     unless ( ref($descriptions) ) {
>         $descriptions = [ $descriptions ];
>     }
>+    my $first = 1;
>     for my $description ( @$descriptions ) {
>-        unless ( $bug_number ) {
>-            say sprintf "Upgrade to %s done (%s)", $DBversion, $description;
>+        if ( @$descriptions > 1 ) {
>+            if ( $first ) {
>+                unless ( $bug_number ) {
>+                    say sprintf "Upgrade to %s done: %s", $DBversion, $description
>+                } else {
>+                    say sprintf "Upgrade to %s done: Bug %s - %s", $DBversion, $bug_number, $description;
>+                }
>+            }
>+            say sprintf "\t\t\t\t\t- %s", $description
>         } else {
>-            say sprintf "Upgrade to %s done (Bug %s - %s)", $DBversion, $bug_number, $description;
>+            unless ( $bug_number ) {
>+                say sprintf "Upgrade to %s done: %s", $DBversion, $description;
>+            } else {
>+                say sprintf "Upgrade to %s done: Bug %s - %s", $DBversion, $bug_number, $description;
>+            }
>         }
>+        $first = 0;
>     }
> }
> 
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 24131: 98536 | 98537 | 99315 | 99316 | 99317 | 99521 | 99522 | 99523 | 99524 | 100161 | 100162 | 100163 | 100164 | 100464 | 100465 | 100466 | 100467 | 100468 | 100530 | 100531 | 100532 | 100533 | 100534 | 100535 | 100536 | 100538 | 101155 | 101159 | 101160 | 101162 | 101164 | 101166 | 101168 | 101187 | 103001