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

(-)a/installer/onboarding.pl (-29 / +13 lines)
Lines 76-87 if ( $step == 1 ) { Link Here
76
76
77
        eval { $library->store; };
77
        eval { $library->store; };
78
        unless ($@) {
78
        unless ($@) {
79
            push @messages,
79
            push @messages, { code => 'success_on_insert_library' };
80
              { type => 'message', code => 'success_on_insert_library' };
81
        }
80
        }
82
        else {
81
        else {
83
            push @messages,
82
            push @messages, { code => 'error_on_insert_library' };
84
              { type => 'message', code => 'error_on_insert_library' };
85
        }
83
        }
86
    }
84
    }
87
85
Lines 130-141 if ( $step == 2 ) { Link Here
130
        eval { $category->store; };
128
        eval { $category->store; };
131
129
132
        unless ($@) {
130
        unless ($@) {
133
            push @messages,
131
            push @messages, { code => 'success_on_insert_category' };
134
              { type => 'message', code => 'success_on_insert_category' };
135
        }
132
        }
136
        else {
133
        else {
137
            push @messages,
134
            push @messages, { code => 'error_on_insert_category' };
138
              { type => 'message', code => 'error_on_insert_category' };
139
        }
135
        }
140
    }
136
    }
141
137
Lines 152-172 if ( $step == 3 ) { Link Here
152
148
153
        if ( my $error_code = checkcardnumber($cardnumber) ) {
149
        if ( my $error_code = checkcardnumber($cardnumber) ) {
154
            if ( $error_code == 1 ) {
150
            if ( $error_code == 1 ) {
155
                push @messages,
151
                push @messages, { code => 'ERROR_cardnumber_already_exists' };
156
                  {
157
                    type => 'alert',
158
                    code => 'ERROR_cardnumber_already_exists'
159
                  };
160
            }
152
            }
161
            elsif ( $error_code == 2 ) {
153
            elsif ( $error_code == 2 ) {
162
                push @messages,
154
                push @messages, { code => 'ERROR_cardnumber_length' };
163
                  { type => 'alert', code => 'ERROR_cardnumber_length' };
164
            }
155
            }
165
        }
156
        }
166
        elsif ( $firstpassword ne $secondpassword ) {
157
        elsif ( $firstpassword ne $secondpassword ) {
167
158
168
            push @messages,
159
            push @messages, { code => 'ERROR_password_mismatch' };
169
              { type => 'alert', code => 'ERROR_password_mismatch' };
170
        }
160
        }
171
        else {
161
        else {
172
162
Lines 194-205 if ( $step == 3 ) { Link Here
194
184
195
            #Error handling checking if the patron was created successfully
185
            #Error handling checking if the patron was created successfully
196
            if ($borrowernumber) {
186
            if ($borrowernumber) {
197
                push @messages,
187
                push @messages, { code => 'success_on_insert_patron' };
198
                  { type => 'message', code => 'success_on_insert_patron' };
199
            }
188
            }
200
            else {
189
            else {
201
                push @messages,
190
                push @messages, { code => 'error_on_insert_patron' };
202
                  { type => 'error', code => 'error_on_insert_patron' };
203
            }
191
            }
204
        }
192
        }
205
    }
193
    }
Lines 221-232 if ( $step == 4 ) { Link Here
221
        eval { $itemtype->store; };
209
        eval { $itemtype->store; };
222
210
223
        unless ($@) {
211
        unless ($@) {
224
            push @messages,
212
            push @messages, { code => 'success_on_insert_itemtype' };
225
              { type => 'message', code => 'success_on_insert_itemtype' };
226
        }
213
        }
227
        else {
214
        else {
228
            push @messages,
215
            push @messages, { code => 'error_on_insert_itemtype' };
229
              { type => 'message', code => 'error_on_insert_itemtype' };
230
        }
216
        }
231
    }
217
    }
232
218
Lines 269-280 if ( $step == 5 ) { Link Here
269
        eval { $issuingrule->store; };
255
        eval { $issuingrule->store; };
270
256
271
        unless ($@) {
257
        unless ($@) {
272
            push @messages,
258
            push @messages, { code => 'success_on_insert_circ_rule' };
273
              { type => 'message', code => 'success_on_insert_circ_rule' };
274
        }
259
        }
275
        else {
260
        else {
276
            push @messages,
261
            push @messages, { code => 'error_on_insert_circ_rule' };
277
              { type => 'message', code => 'error_on_insert_circ_rule' };
278
        }
262
        }
279
    }
263
    }
280
264
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt (-1 / +1 lines)
Lines 21-26 Link Here
21
                [% IF all_done %]
21
                [% IF all_done %]
22
22
23
                    <h2>Web installer &rsaquo; Complete</h2>
23
                    <h2>Web installer &rsaquo; Complete</h2>
24
                    [% INCLUDE 'onboarding_messages.inc' %]
24
                    <h3>Congratulations you have finished and are ready to use Koha</h3>
25
                    <h3>Congratulations you have finished and are ready to use Koha</h3>
25
                    <a class="btn btn-success" href="/cgi-bin/koha/mainpage.pl">Start using Koha</a>
26
                    <a class="btn btn-success" href="/cgi-bin/koha/mainpage.pl">Start using Koha</a>
26
27
27
- 

Return to bug 17942