From 7e95a1bc3154ae5f9471c8360a46534f18b2428d 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>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 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 39c4f42682..4b829ed794 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -21159,16 +21159,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