From 74511d87b5fa57657cadd16588dfe40d30eb9820 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 15 Feb 2024 14:06:33 +0100 Subject: [PATCH] Bug 36102: Fix 01-installation.t Something very weird is happening here. There is a FIXME already, but the trick does not seem to work anymore (?) This patch contains some debug statements and take some screenshots. We are reaching the cud-selectframeworks step then we are expecting the form to submit the form with op=cud-addframeworks BUT it seems that "op" is empty, and there is an unexpected warning from Starman: ==> /var/log/koha/kohadev/plack-error.log <== "" Use of uninitialized value in string ne at /usr/share/perl5/Starman/Server.pm line 304. ==> /var/log/koha/kohadev/plack-intranet-error.log <== [2024/02/15 13:09:34] [WARN] Warning: something's wrong at /kohadevbox/koha/installer/install.pl line 89. What's going on here?? UPDATE: This is fixed by "Bug 34478: Manual fix - Make Koha::Token use session id not userenv id" Bug 36102: [TO SQUASH] Fix 01-installation.t Signed-off-by: Jonathan Druart --- installer/install.pl | 6 ++++-- .../intranet-tmpl/prog/en/modules/installer/step3.tt | 10 +++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/installer/install.pl b/installer/install.pl index d50f15aec6..a35b98045d 100755 --- a/installer/install.pl +++ b/installer/install.pl @@ -527,8 +527,10 @@ else { } } -$op =~ s/cud-//; -$template->param( op => $op, $op => 1 ); +if ($op) { + $op =~ s/cud-//; + $template->param( op => $op, $op => 1 ); +} output_html_with_http_headers $query, $cookie, $template->output; 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 8a3e5b4b83..fabd7605d3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt @@ -83,7 +83,7 @@ -
+ [% INCLUDE 'csrf-token.inc' %] @@ -123,7 +123,7 @@ - + [% INCLUDE 'csrf-token.inc' %] @@ -291,7 +291,7 @@ - + [% INCLUDE 'csrf-token.inc' %]

@@ -314,7 +314,7 @@

Now we're ready to create the database tables and fill them with some default data.

- + [% INCLUDE 'csrf-token.inc' %] @@ -347,7 +347,7 @@

We are ready to do some basic configuration.

- + [% INCLUDE 'csrf-token.inc' %] -- 2.39.5