Attachment 58904 Details for Bug 17855 – Bug 17855 - Fixed the errors from the koha qa test

[patch] Bug 17855 - Fixed the errors from the koha qa test

Bug-17855---Fixed-the-errors-from-the-koha-qa-test.patch (text/plain), 6.32 KB, created by Mark Tompsett on 2017-01-13 02:37:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Tompsett

Created: 2017-01-13 02:37:32 UTC

Size: 6.32 KB

patch

obsolete

>From afcea7b6673900330af8ae5adb797b6ff2f6cd56 Mon Sep 17 00:00:00 2001
>From: "@alexbuckley" <@alexbuckley>
>Date: Fri, 13 Jan 2017 00:56:06 +0000
>Subject: [PATCH] Bug 17855 - Fixed the errors from the koha qa test
>
>Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
>---
> installer/install.pl                                              | 8 ++++----
> installer/onboarding.pl                                           | 4 +---
> .../intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt   | 4 +++-
> .../intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt   | 4 ++--
> .../intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt   | 2 +-
> 5 files changed, 11 insertions(+), 11 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 eb20b44..a7ee365 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 f361d73..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">
>@@ -76,3 +76,5 @@
>              <input type="submit" class="action" value="Submit"/>
>      </form>
> [% 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 ffac962..3ba72a5 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 %] 
>+[% IF (categories && categories.count > 0) %] 
> <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 ce730c6..a970e4b 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

Actions: View | Diff | Splinter Review

Attachments on bug 17855: 58657 | 58658 | 58659 | 58660 | 58661 | 58662 | 58663 | 58664 | 58665 | 58666 | 58667 | 58668 | 58669 | 58781 | 58782 | 58783 | 58784 | 58785 | 58792 | 58793 | 58794 | 58846 | 58860 | 58861 | 58862 | 58886 | 58892 | 58893 | 58894 | 58895 | 58896 | 58897 | 58898 | 58899 | 58900 | 58901 | 58902 | 58903 | 58904 | 58905 | 58906 | 58907 | 59037 | 59051 | 59140 | 59141 | 59174 | 59188 | 59277 | 59279 | 59280 | 59281 | 59628 | 59703 | 59705 | 59706 | 59707 | 59708 | 59709 | 59710 | 59711 | 59712 | 59742 | 59826 | 59830 | 59840 | 59841 | 59842 | 59856 | 59857 | 60092 | 61667 | 61668 | 61986 | 62186 | 62191 | 62192 | 62193 | 62220 | 62221 | 62222 | 62223 | 62231 | 62233 | 62234 | 62235 | 62236 | 62237 | 62238 | 62239 | 62240 | 62241 | 62242 | 62243 | 62251 | 62252 | 62253 | 62254 | 62255 | 62256 | 62257 | 62258 | 62259 | 62260 | 62261 | 62262 | 62263 | 62281 | 62282 | 62283 | 62284 | 62285 | 62286 | 62287 | 62288 | 62668 | 62669 | 62670 | 62671 | 62672 | 62673 | 62674 | 62675