From 03458495b74f585f50bca3bde5acc8c000999a5c Mon Sep 17 00:00:00 2001
From: Alex Buckley <alexbuckley@catalyst.net.nz>
Date: Mon, 2 Oct 2017 17:51:16 +1300
Subject: [PATCH] Bug 19394 - Ability to skip the onboarding tool implemented

---
 installer/onboarding.pl                                    | 6 +++++-
 koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt | 8 ++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/installer/onboarding.pl b/installer/onboarding.pl
index 8b032c9..e10eff2 100755
--- a/installer/onboarding.pl
+++ b/installer/onboarding.pl
@@ -37,7 +37,7 @@ use Koha::IssuingRules;
 my $input = new CGI;
 
 unless ( C4::Context->preference('Version') ) {
-    print $input->redirect("/cgi-bin/koha/installer/install.pl");
+    print $input->redirect("mainpage.pl");
     exit;
 }
 
@@ -57,6 +57,10 @@ my $schema = Koha::Database->new()->schema();
 
 my @messages;
 
+if ( $op && $op eq 'skip' ) {
+     print $input->redirect("/cgi-bin/koha/mainpage.pl");
+     exit;
+}
 if ( $step == 1 ) {
 
     if ( $op eq 'add_validate_library' ) {
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 42f1295..246afa2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
@@ -33,8 +33,8 @@
 </title>
 
 [% IF ( finish ) %]
-    [%- metacontent= '10; url=/cgi-bin/koha/installer/onboarding.pl' -%]
-    <meta http-equiv="refresh" content="[% metacontent %]">
+ <!--   [%- metacontent= '10; url=/cgi-bin/koha/installer/onboarding.pl' -%]
+    <meta http-equiv="refresh" content="[% metacontent %]">-->
 [% END %]
 [% INCLUDE 'installer-doc-head-close.inc' %]
 </head>
@@ -47,6 +47,10 @@
                 [% IF ( finish ) %]
                     <h2>Web installer &rsaquo; Installation complete</h2>
                     <h3>Congratulations, installation complete</h3>
+                    <form name="navigationform" method="post" action="onboarding.pl">
+                        <input type="hidden" name="op" value="skip"/>
+                        <button type="submit" value="submit">Skip onboarding process.</button>
+                    </form>
                     <p>This page will redirect in 10 seconds. <a href="/cgi-bin/koha/installer/onboarding.pl">If not, click here to start onboarding process.</a></p>
                 [% END %]
 
-- 
2.7.4