Bugzilla – Attachment 63021 Details for
Bug 17942
Update style of the web installer with Bootstrap 3
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 17942: Remove type for messages
Bug-17942-Remove-type-for-messages.patch (text/plain), 4.87 KB, created by
Jonathan Druart
on 2017-05-03 15:01:09 UTC
(
hide
)
Description:
Bug 17942: Remove type for messages
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2017-05-03 15:01:09 UTC
Size:
4.87 KB
patch
obsolete
>From ed21c302db591cb9a46c5162d2a4da767f7452b8 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Tue, 2 May 2017 18:24:23 -0300 >Subject: [PATCH] Bug 17942: Remove type for messages > >It it no longer in used by the templates. > >Also add the include files for step5 (if the circ rule is not inserted) > >Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >--- > installer/onboarding.pl | 42 +++++++--------------- > .../prog/en/modules/onboarding/onboardingstep5.tt | 1 + > 2 files changed, 14 insertions(+), 29 deletions(-) > >diff --git a/installer/onboarding.pl b/installer/onboarding.pl >index 02d4827..8b032c9 100755 >--- a/installer/onboarding.pl >+++ b/installer/onboarding.pl >@@ -76,12 +76,10 @@ if ( $step == 1 ) { > > eval { $library->store; }; > unless ($@) { >- push @messages, >- { type => 'message', code => 'success_on_insert_library' }; >+ push @messages, { code => 'success_on_insert_library' }; > } > else { >- push @messages, >- { type => 'message', code => 'error_on_insert_library' }; >+ push @messages, { code => 'error_on_insert_library' }; > } > } > >@@ -130,12 +128,10 @@ if ( $step == 2 ) { > eval { $category->store; }; > > unless ($@) { >- push @messages, >- { type => 'message', code => 'success_on_insert_category' }; >+ push @messages, { code => 'success_on_insert_category' }; > } > else { >- push @messages, >- { type => 'message', code => 'error_on_insert_category' }; >+ push @messages, { code => 'error_on_insert_category' }; > } > } > >@@ -152,21 +148,15 @@ if ( $step == 3 ) { > > if ( my $error_code = checkcardnumber($cardnumber) ) { > if ( $error_code == 1 ) { >- push @messages, >- { >- type => 'alert', >- code => 'ERROR_cardnumber_already_exists' >- }; >+ push @messages, { code => 'ERROR_cardnumber_already_exists' }; > } > elsif ( $error_code == 2 ) { >- push @messages, >- { type => 'alert', code => 'ERROR_cardnumber_length' }; >+ push @messages, { code => 'ERROR_cardnumber_length' }; > } > } > elsif ( $firstpassword ne $secondpassword ) { > >- push @messages, >- { type => 'alert', code => 'ERROR_password_mismatch' }; >+ push @messages, { code => 'ERROR_password_mismatch' }; > } > else { > >@@ -194,12 +184,10 @@ if ( $step == 3 ) { > > #Error handling checking if the patron was created successfully > if ($borrowernumber) { >- push @messages, >- { type => 'message', code => 'success_on_insert_patron' }; >+ push @messages, { code => 'success_on_insert_patron' }; > } > else { >- push @messages, >- { type => 'error', code => 'error_on_insert_patron' }; >+ push @messages, { code => 'error_on_insert_patron' }; > } > } > } >@@ -221,12 +209,10 @@ if ( $step == 4 ) { > eval { $itemtype->store; }; > > unless ($@) { >- push @messages, >- { type => 'message', code => 'success_on_insert_itemtype' }; >+ push @messages, { code => 'success_on_insert_itemtype' }; > } > else { >- push @messages, >- { type => 'message', code => 'error_on_insert_itemtype' }; >+ push @messages, { code => 'error_on_insert_itemtype' }; > } > } > >@@ -269,12 +255,10 @@ if ( $step == 5 ) { > eval { $issuingrule->store; }; > > unless ($@) { >- push @messages, >- { type => 'message', code => 'success_on_insert_circ_rule' }; >+ push @messages, { code => 'success_on_insert_circ_rule' }; > } > else { >- push @messages, >- { type => 'message', code => 'error_on_insert_circ_rule' }; >+ push @messages, { code => 'error_on_insert_circ_rule' }; > } > } > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt >index af203ed..dfae544 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt >@@ -21,6 +21,7 @@ > [% IF all_done %] > > <h2>Web installer › Complete</h2> >+ [% INCLUDE 'onboarding_messages.inc' %] > <h3>Congratulations you have finished and are ready to use Koha</h3> > <a class="btn btn-success" href="/cgi-bin/koha/mainpage.pl">Start using Koha</a> > >-- >2.9.3
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 17942
:
59275
|
59623
|
59624
|
59625
|
59627
|
59721
|
60098
|
60099
|
60100
|
60101
|
60527
|
60710
|
62856
|
62857
|
62861
|
62862
|
63013
|
63019
|
63020
| 63021 |
63022