View | Details | Raw Unified | Return to bug 17855
Collapse All | Expand All

(-)a/installer/install.pl (-4 / +4 lines)
Lines 194-201 elsif ( $step && $step == 2 ) { Link Here
194
                # Check if user has all necessary grants on this database...
194
                # Check if user has all necessary grants on this database...
195
                my $rq = $dbh->do(
195
                my $rq = $dbh->do(
196
                    "SELECT u.usesuper
196
                    "SELECT u.usesuper
197
				    FROM pg_catalog.pg_user as u
197
            FROM pg_catalog.pg_user as u
198
				    WHERE u.usename = \'$info{user}\';"
198
            WHERE u.usename = \'$info{user}\';"
199
                );
199
                );
200
                if ( $rq == 1 ) {
200
                if ( $rq == 1 ) {
201
                    $template->param( "checkgrantaccess" => 1 );
201
                    $template->param( "checkgrantaccess" => 1 );
Lines 439-446 elsif ( $step && $step == 3 ) { Link Here
439
        elsif ( $info{dbms} eq 'Pg' ) {
439
        elsif ( $info{dbms} eq 'Pg' ) {
440
            $rq = $dbh->prepare(
440
            $rq = $dbh->prepare(
441
                "SELECT *
441
                "SELECT *
442
								FROM information_schema.tables
442
                FROM information_schema.tables
443
								WHERE table_schema='public' and table_type='BASE TABLE';"
443
                WHERE table_schema='public' and table_type='BASE TABLE';"
444
            );
444
            );
445
        }
445
        }
446
        $rq->execute;
446
        $rq->execute;
(-)a/installer/onboarding.pl (-3 / +1 lines)
Lines 166-172 elsif ( $step && $step == 1 ) { Link Here
166
      ; # Use a regular expression to check the value of the inputted branchcode
166
      ; # Use a regular expression to check the value of the inputted branchcode
167
167
168
#Create a new library object and store the branchcode and @fields array values in this new library object
168
#Create a new library object and store the branchcode and @fields array values in this new library object
169
    my $library = Koha::Library->new(
169
    $library = Koha::Library->new(
170
        {
170
        {
171
            branchcode => $branchcode,
171
            branchcode => $branchcode,
172
            ( map { $_ => scalar $input->param($_) || undef } @fields )
172
            ( map { $_ => scalar $input->param($_) || undef } @fields )
Lines 304-311 elsif ( $step && $step == 3 ) { Link Here
304
    my @messages;
304
    my @messages;
305
    my @errors;
305
    my @errors;
306
    my $nok            = $input->param('nok');
306
    my $nok            = $input->param('nok');
307
    my $firstpassword  = $input->param('password');
308
    my $secondpassword = $input->param('password2');
309
    my $cardnumber     = $input->param('cardnumber');
307
    my $cardnumber     = $input->param('cardnumber');
310
    my $borrowernumber = $input->param('borrowernumber');
308
    my $borrowernumber = $input->param('borrowernumber');
311
    my $userid         = $input->param('userid');
309
    my $userid         = $input->param('userid');
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt (-2 / +1 lines)
Lines 11-17 Link Here
11
    <h1 align="center"> Welcome to Koha</h1>
11
    <h1 align="center"> Welcome to Koha</h1>
12
    <h1 id="logo"><img alt="Koha" style="width:50%;margin:auto;display:block;align:center;"  src="[% interface %]/[% theme %]/img/koha.org-logo.gif"/></h1>
12
    <h1 id="logo"><img alt="Koha" style="width:50%;margin:auto;display:block;align:center;"  src="[% interface %]/[% theme %]/img/koha.org-logo.gif"/></h1>
13
</div>
13
</div>
14
 [% IF libraries.count > 0 %]
14
 [% IF (libraries && libraries.count > 0) %]
15
 <br>
15
 <br>
16
    <h3 align="left">You do not need to create a library as you have already installed the sample library data previously</h3>
16
    <h3 align="left">You do not need to create a library as you have already installed the sample library data previously</h3>
17
    <form name="skiplibrary" method="post" action="onboarding.pl">
17
    <form name="skiplibrary" method="post" action="onboarding.pl">
Lines 78-81 Link Here
78
[% END %]
78
[% END %]
79
79
80
80
81
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt (-2 / +2 lines)
Lines 128-134 $(document).ready(function(){ Link Here
128
             showOn: "both",
128
             showOn: "both",
129
             changeMonth: true,
129
             changeMonth: true,
130
             changeYear: true,
130
             changeYear: true,
131
             buttonImage: '/intranet-tmpl/prog/img/famfamfam/silk/calendar.png',
131
             buttonImage: '/[% interface %]/prog/img/famfamfam/silk/calendar.png',
132
             buttonImageOnly: true,
132
             buttonImageOnly: true,
133
             showButtonPanel: true,
133
             showButtonPanel: true,
134
             showOtherMonths: true,
134
             showOtherMonths: true,
Lines 273-279 $(document).ready(function() { Link Here
273
</div>
273
</div>
274
274
275
275
276
[% 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-->
276
[% 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-->
277
<br>
277
<br>
278
     <h3 align="left">You do not need to create a patron category as you have already installed the sample patron categories data previously</h3>
278
     <h3 align="left">You do not need to create a patron category as you have already installed the sample patron categories data previously</h3>
279
     <form name="skippatroncategory" method="post" action="onboarding.pl">
279
     <form name="skippatroncategory" method="post" action="onboarding.pl">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt (-2 / +1 lines)
Lines 18-24 Link Here
18
    <h1 id="logo"><img alt="Koha" style="width:50%;margin:auto;display:block;align:center;"  src="[% interface %]/[% theme %]/img/koha.org-logo.gif"/></h1>
18
    <h1 id="logo"><img alt="Koha" style="width:50%;margin:auto;display:block;align:center;"  src="[% interface %]/[% theme %]/img/koha.org-logo.gif"/></h1>
19
</div>
19
</div>
20
20
21
[% IF itemtypes.count > 0 %]
21
[% IF (itemtypes && itemtypes.count > 0) %]
22
    <br>
22
    <br>
23
        <h3 align="left">You do not need to create a item type as you have already installed the sample item type data previously</h3>
23
        <h3 align="left">You do not need to create a item type as you have already installed the sample item type data previously</h3>
24
     <form name="skipitemtype" method="post" action="onboarding.pl">
24
     <form name="skipitemtype" method="post" action="onboarding.pl">
25
- 

Return to bug 17855