From 4e7e5bafc88afe3f5efec305b4d86bb0938ae02d Mon Sep 17 00:00:00 2001
From: "@alexbuckley" <alexbuckley@catalyst.net.nz>
Date: Fri, 13 Jan 2017 00:56:06 +0000
Subject: [PATCH] Bug 17855 - Fixed the errors from the koha qa test

---
 installer/install.pl                                              | 8 ++++----
 installer/onboarding.pl                                           | 4 +---
 .../intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt   | 3 +--
 .../intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt   | 4 ++--
 .../intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt   | 2 +-
 5 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/installer/install.pl b/installer/install.pl
index c31bd2a..248bf04 100755
--- a/installer/install.pl
+++ b/installer/install.pl
@@ -194,8 +194,8 @@ elsif ( $step && $step == 2 ) {
                 # Check if user has all necessary grants on this database...
                 my $rq = $dbh->do(
                     "SELECT u.usesuper
-				    FROM pg_catalog.pg_user as u
-				    WHERE u.usename = \'$info{user}\';"
+            FROM pg_catalog.pg_user as u
+            WHERE u.usename = \'$info{user}\';"
                 );
                 if ( $rq == 1 ) {
                     $template->param( "checkgrantaccess" => 1 );
@@ -439,8 +439,8 @@ elsif ( $step && $step == 3 ) {
         elsif ( $info{dbms} eq 'Pg' ) {
             $rq = $dbh->prepare(
                 "SELECT *
-								FROM information_schema.tables
-								WHERE table_schema='public' and table_type='BASE TABLE';"
+                FROM information_schema.tables
+                WHERE table_schema='public' and table_type='BASE TABLE';"
             );
         }
         $rq->execute;
diff --git a/installer/onboarding.pl b/installer/onboarding.pl
index 1b1455b..12eaec7 100755
--- a/installer/onboarding.pl
+++ b/installer/onboarding.pl
@@ -166,7 +166,7 @@ elsif ( $step && $step == 1 ) {
       ; # Use a regular expression to check the value of the inputted branchcode
 
 #Create a new library object and store the branchcode and @fields array values in this new library object
-    my $library = Koha::Library->new(
+    $library = Koha::Library->new(
         {
             branchcode => $branchcode,
             ( map { $_ => scalar $input->param($_) || undef } @fields )
@@ -304,8 +304,6 @@ elsif ( $step && $step == 3 ) {
     my @messages;
     my @errors;
     my $nok            = $input->param('nok');
-    my $firstpassword  = $input->param('password');
-    my $secondpassword = $input->param('password2');
     my $cardnumber     = $input->param('cardnumber');
     my $borrowernumber = $input->param('borrowernumber');
     my $userid         = $input->param('userid');
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt
index e4cbd67..2c3d153 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt
@@ -11,7 +11,7 @@
     <h1 align="center"> Welcome to Koha</h1>
     <h1 id="logo"><img alt="Koha" style="width:50%;margin:auto;display:block;align:center;"  src="[% interface %]/[% theme %]/img/koha.org-logo.gif"/></h1>
 </div>
- [% IF libraries.count > 0 %]
+ [% IF (libraries && libraries.count > 0) %]
  <br>
     <h3 align="left">You do not need to create a library as you have already installed the sample library data previously</h3>
     <form name="skiplibrary" method="post" action="onboarding.pl">
@@ -78,4 +78,3 @@
 [% END %]
 
 
-
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt
index 0a958c2..afb2236 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt
@@ -128,7 +128,7 @@ $(document).ready(function(){
              showOn: "both",
              changeMonth: true,
              changeYear: true,
-             buttonImage: '/intranet-tmpl/prog/img/famfamfam/silk/calendar.png',
+             buttonImage: '/[% interface %]/prog/img/famfamfam/silk/calendar.png',
              buttonImageOnly: true,
              showButtonPanel: true,
              showOtherMonths: true,
@@ -273,7 +273,7 @@ $(document).ready(function() {
 </div>
 
 
-[% IF categories.count > 0 %] <!--This if statement checks if the categories variable handed to this template by onboarding.pl has data in it. If the categories variable does have data in it this means that the user has previously imported sample patron category data and so we do not need to show them the create patron category screen 1, instead we can display a screen with ubtton redirecting the user to step 3-->
+[% IF (categories && categories.count > 0) %] <!--This if statement checks if the categories variable handed to this template by onboarding.pl has data in it. If the categories variable does have data in it this means that the user has previously imported sample patron category data and so we do not need to show them the create patron category screen 1, instead we can display a screen with ubtton redirecting the user to step 3-->
 <br>
      <h3 align="left">You do not need to create a patron category as you have already installed the sample patron categories data previously</h3>
      <form name="skippatroncategory" method="post" action="onboarding.pl">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt
index 442a273..4dbdf05 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt
@@ -18,7 +18,7 @@
     <h1 id="logo"><img alt="Koha" style="width:50%;margin:auto;display:block;align:center;"  src="[% interface %]/[% theme %]/img/koha.org-logo.gif"/></h1>
 </div>
 
-[% IF itemtypes.count > 0 %]
+[% IF (itemtypes && itemtypes.count > 0) %]
     <br>
         <h3 align="left">You do not need to create a item type as you have already installed the sample item type data previously</h3>
      <form name="skipitemtype" method="post" action="onboarding.pl">
-- 
2.1.4