Attachment 152232 Details for Bug 33938 – Bug 33938: Don't tell the DB is not up-to-date when it is

[patch] Bug 33938: Don't tell the DB is not up-to-date when it is

Bug-33938-Dont-tell-the-DB-is-not-up-to-date-when-.patch (text/plain), 2.21 KB, created by Katrin Fischer on 2023-06-09 09:32:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2023-06-09 09:32:20 UTC

Size: 2.21 KB

patch

obsolete

>From 7e83fe86432ae11c63b467e2f51c799f9014fa3b Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Wed, 7 Jun 2023 13:44:40 +0200
>Subject: [PATCH] Bug 33938: Don't tell the DB is not up-to-date when it is
>
>If you hit /cgi-bin/koha/installer/install.pl and that the DB is up-to-date already,
>the screen shows "We are upgrading from Koha 23.06.00.002 to 23.06.00.002".
>
>We should just say that everything is ok
>
>Test plan:
>Have an up-to-date DB, then hit /cgi-bin/koha/installer/install.pl
>Notice that the message changed and is more correct with the patch
>applied.
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> .../intranet-tmpl/prog/en/modules/installer/step3.tt     | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
>index 4462deb523..fdbddf58a3 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
>@@ -314,8 +314,13 @@
>                 [% IF ( default ) %]
>                     [% IF ( upgrading ) %]
>                         <h1>Web installer &rsaquo; Update database</h1>
>-                        <p>We are upgrading from Koha [% dbversion | html %] to [% kohaversion | html %]</p>
>-                        <p><a href="install.pl?step=3&amp;op=updatestructure" class="btn btn-primary">Update your database</a></p>
>+                        [% IF dbversion != kohaversion %]
>+                            <p>We are upgrading from Koha [% dbversion | html %] to [% kohaversion | html %]</p>
>+                            <p><a href="install.pl?step=3&amp;op=updatestructure" class="btn btn-primary">Update your database</a></p>
>+                        [% ELSE %]
>+                            <p>The database is up-to-date already (Koha [% kohaversion | html %])</p>
>+                            <p><a href="install.pl?step=3&amp;op=finished" class="btn btn-primary">Continue to log in to Koha</a></p>
>+                        [% END %]
>                     [% ELSE %]
>                         <h1>Web installer &rsaquo; Install basic configuration settings</h1>
> 
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 33938: 152098 | 152232