@@ -, +, @@ default data values are successfully being inserted into the database. Bug 17855- Removed loop in web installer forcing users to update their database version. Changed --- .../mysql/en/{optional => default}/auth_val.sql | 0 .../mysql/en/{optional => default}/auth_val.txt | 0 .../en/{mandatory => default}/auth_values.sql | 0 .../en/{mandatory => default}/auth_values.txt | 0 .../en/{mandatory => default}/class_sources.sql | 0 .../en/{mandatory => default}/class_sources.txt | 0 .../en/{optional => default}/csv_profiles.sql | 0 .../en/{optional => default}/csv_profiles.txt | 2 - .../message_transport_types.sql | 0 .../message_transport_types.txt | 1 - .../mysql/en/{optional => default}/parameters.sql | 0 .../mysql/en/{optional => default}/parameters.txt | 0 .../{mandatory => default}/patron_attributes.sql | 0 .../data/mysql/en/default/patron_attributes.txt | 1 + .../{mandatory => default}/sample_frequencies.sql | 0 .../{mandatory => default}/sample_frequencies.txt | 0 .../en/{optional => default}/sample_itemtypes.sql | 0 .../en/{optional => default}/sample_itemtypes.txt | 0 .../en/{mandatory => default}/sample_notices.sql | 0 .../en/{mandatory => default}/sample_notices.txt | 0 .../sample_notices_message_attributes.sql | 0 .../sample_notices_message_attributes.txt | 0 .../sample_notices_message_transports.sql | 0 .../sample_notices_message_transports.txt | 0 .../sample_numberpatterns.sql | 0 .../sample_numberpatterns.txt | 0 .../data/mysql/en/mandatory/patron_attributes.txt | 0 .../authorities_normal_marc21.sql | 0 .../authorities_normal_marc21.txt | 2 - .../marc21_default_matching_rules.sql | 0 .../marc21_default_matching_rules.txt | 5 +- .../marc21_framework_DEFAULT.sql | 0 .../marc21_framework_DEFAULT.txt | 0 .../marc21_sample_fastadd_framework.sql | 0 .../marc21_sample_fastadd_framework.txt | 0 .../marc21_simple_bib_frameworks.sql | 0 .../marc21_simple_bib_frameworks.txt | 1 - .../authorities_normal_unimarc.sql | 0 .../unimarc/default/authorities_normal_unimarc.txt | 1 + .../unimarc_framework_DEFAULT.sql | 0 .../unimarc_framework_DEFAULT.txt | 0 .../mandatory/authorities_normal_unimarc.txt | 1 - .../data/mysql/en/optional/patron_categories.txt | 6 +- .../data/mysql/en/optional/sample_holidays.txt | 5 +- .../data/mysql/en/optional/sample_libraries.txt | 2 +- .../mysql/en/optional/sample_z3950_servers.txt | 1 + .../prog/en/modules/installer/Backupstep3.tt | 257 +++++++++++++++++++++ .../prog/en/modules/installer/step3.tt | 125 ++++++---- 48 files changed, 340 insertions(+), 70 deletions(-) rename installer/data/mysql/en/{optional => default}/auth_val.sql (100%) rename installer/data/mysql/en/{optional => default}/auth_val.txt (100%) rename installer/data/mysql/en/{mandatory => default}/auth_values.sql (100%) rename installer/data/mysql/en/{mandatory => default}/auth_values.txt (100%) rename installer/data/mysql/en/{mandatory => default}/class_sources.sql (100%) rename installer/data/mysql/en/{mandatory => default}/class_sources.txt (100%) rename installer/data/mysql/en/{optional => default}/csv_profiles.sql (100%) rename installer/data/mysql/en/{optional => default}/csv_profiles.txt (83%) rename installer/data/mysql/en/{mandatory => default}/message_transport_types.sql (100%) rename installer/data/mysql/en/{mandatory => default}/message_transport_types.txt (98%) rename installer/data/mysql/en/{optional => default}/parameters.sql (100%) rename installer/data/mysql/en/{optional => default}/parameters.txt (100%) rename installer/data/mysql/en/{mandatory => default}/patron_attributes.sql (100%) create mode 100644 installer/data/mysql/en/default/patron_attributes.txt rename installer/data/mysql/en/{mandatory => default}/sample_frequencies.sql (100%) rename installer/data/mysql/en/{mandatory => default}/sample_frequencies.txt (100%) rename installer/data/mysql/en/{optional => default}/sample_itemtypes.sql (100%) rename installer/data/mysql/en/{optional => default}/sample_itemtypes.txt (100%) rename installer/data/mysql/en/{mandatory => default}/sample_notices.sql (100%) rename installer/data/mysql/en/{mandatory => default}/sample_notices.txt (100%) rename installer/data/mysql/en/{mandatory => default}/sample_notices_message_attributes.sql (100%) rename installer/data/mysql/en/{mandatory => default}/sample_notices_message_attributes.txt (100%) rename installer/data/mysql/en/{mandatory => default}/sample_notices_message_transports.sql (100%) rename installer/data/mysql/en/{mandatory => default}/sample_notices_message_transports.txt (100%) rename installer/data/mysql/en/{mandatory => default}/sample_numberpatterns.sql (100%) rename installer/data/mysql/en/{mandatory => default}/sample_numberpatterns.txt (100%) delete mode 100644 installer/data/mysql/en/mandatory/patron_attributes.txt rename installer/data/mysql/en/marcflavour/marc21/{mandatory => default}/authorities_normal_marc21.sql (100%) rename installer/data/mysql/en/marcflavour/marc21/{mandatory => default}/authorities_normal_marc21.txt (98%) rename installer/data/mysql/en/marcflavour/marc21/{optional => default}/marc21_default_matching_rules.sql (100%) rename installer/data/mysql/en/marcflavour/marc21/{optional => default}/marc21_default_matching_rules.txt (61%) rename installer/data/mysql/en/marcflavour/marc21/{mandatory => default}/marc21_framework_DEFAULT.sql (100%) rename installer/data/mysql/en/marcflavour/marc21/{mandatory => default}/marc21_framework_DEFAULT.txt (100%) rename installer/data/mysql/en/marcflavour/marc21/{optional => default}/marc21_sample_fastadd_framework.sql (100%) rename installer/data/mysql/en/marcflavour/marc21/{optional => default}/marc21_sample_fastadd_framework.txt (100%) rename installer/data/mysql/en/marcflavour/marc21/{optional => default}/marc21_simple_bib_frameworks.sql (100%) rename installer/data/mysql/en/marcflavour/marc21/{optional => default}/marc21_simple_bib_frameworks.txt (99%) rename installer/data/mysql/en/marcflavour/unimarc/{mandatory => default}/authorities_normal_unimarc.sql (100%) create mode 100644 installer/data/mysql/en/marcflavour/unimarc/default/authorities_normal_unimarc.txt rename installer/data/mysql/en/marcflavour/unimarc/{mandatory => default}/unimarc_framework_DEFAULT.sql (100%) rename installer/data/mysql/en/marcflavour/unimarc/{mandatory => default}/unimarc_framework_DEFAULT.txt (100%) delete mode 100644 installer/data/mysql/en/marcflavour/unimarc/mandatory/authorities_normal_unimarc.txt create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/installer/Backupstep3.tt --- a/installer/data/mysql/en/optional/csv_profiles.txt +++ a/installer/data/mysql/en/optional/csv_profiles.txt @@ -1,3 +1, @@ -CSV profiles - Default CSV export profiles; including one for exporting serial claims. --- a/installer/data/mysql/en/mandatory/message_transport_types.txt +++ a/installer/data/mysql/en/mandatory/message_transport_types.txt @@ -1,2 +1, @@ Defines default message transports for email and sms. - --- a/installer/data/mysql/en/default/patron_attributes.txt +++ a/installer/data/mysql/en/default/patron_attributes.txt @@ -0,0 +1, @@ +Patron attributes --- a/installer/data/mysql/en/marcflavour/marc21/mandatory/authorities_normal_marc21.txt +++ a/installer/data/mysql/en/marcflavour/marc21/mandatory/authorities_normal_marc21.txt @@ -1,5 +1,4 @@ Default MARC21 Standard Authority types: - Personal Name Corporate Name Meeting Name @@ -8,4 +7,3 @@ Default MARC21 Standard Authority types: Topical Term Geographic Name Genre/Form Term - --- a/installer/data/mysql/en/marcflavour/marc21/optional/marc21_default_matching_rules.txt +++ a/installer/data/mysql/en/marcflavour/marc21/optional/marc21_default_matching_rules.txt @@ -1,5 +1,2 @@ Selected matching rules for MARC 21 bibliographic -records, including: - -ISBN -ISSN +records, including: ISBN, ISSN --- a/installer/data/mysql/en/marcflavour/marc21/optional/marc21_simple_bib_frameworks.txt +++ a/installer/data/mysql/en/marcflavour/marc21/optional/marc21_simple_bib_frameworks.txt @@ -1,5 +1,4 @@ Simple MARC 21 bibliographic frameworks for some common types of bibliographic material. Frameworks are used to define the structure of your MARC records and the behavior of the integrated MARC editor. You can change these at any time after installation. The frameworks in this optional default setting include: - BKS Books, Booklets, Workbooks CF CD-ROMs, DVD-ROMs, General Online Resources SR Audio Cassettes, CDs --- a/installer/data/mysql/en/marcflavour/unimarc/default/authorities_normal_unimarc.txt +++ a/installer/data/mysql/en/marcflavour/unimarc/default/authorities_normal_unimarc.txt @@ -0,0 +1, @@ + Authority structure for UNIMARC in English. --- a/installer/data/mysql/en/marcflavour/unimarc/mandatory/authorities_normal_unimarc.txt +++ a/installer/data/mysql/en/marcflavour/unimarc/mandatory/authorities_normal_unimarc.txt @@ -1, +0,0 @@ -Authority structure for UNIMARC in English. --- a/installer/data/mysql/en/optional/patron_categories.txt +++ a/installer/data/mysql/en/optional/patron_categories.txt @@ -1,6 +1,4 @@ -Sample patron types and categories: - -Type: Categories: +Sample patron types and categories. Types are currently hardcoded but you can manage categories after installation from the administration module. Adult patron - default patron type PT - Patron @@ -21,5 +19,3 @@ Professional - a member of an organization (organization is guarantor) T - Teacher S - Staff B - Board - -Types are currently hardcoded, but you can add/edit/delete categories after installation from the administration module. --- a/installer/data/mysql/en/optional/sample_holidays.txt +++ a/installer/data/mysql/en/optional/sample_holidays.txt @@ -1,4 +1, @@ -Sample holidays: - Sundays - Christmas - New Year's +Sample holidays: Sunday, Christmas, New Year's --- a/installer/data/mysql/en/optional/sample_libraries.txt +++ a/installer/data/mysql/en/optional/sample_libraries.txt @@ -1, +1, @@ -A few sample libraries. +Sample libraries. --- a/installer/data/mysql/en/optional/sample_z3950_servers.txt +++ a/installer/data/mysql/en/optional/sample_z3950_servers.txt @@ -1,3 +1,4 @@ +Allow access to the following servers to search and download record information: LIBRARY OF CONGRESS LIBRARY OF CONGRESS NAMES (authority records) LIBRARY OF CONGRESS SUBJECTS (authority records) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/Backupstep3.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/Backupstep3.tt @@ -0,0 +1,257 @@ +[% INCLUDE 'doc-head-open.inc' %]Koha › Web installer › Step 3 +[% IF ( finish ) %][% END %] +[% INCLUDE 'installer-doc-head-close.inc' %] +
+

Koha Koha web installer › Step 3

+ +[% IF ( selectframeworks ) %] + +[% END %] +[% IF ( finish ) %] +

Congratulations, installation complete

+

If this page does not redirect in 5 seconds, click here.

+[% END %] +[% IF ( choosemarc ) %] +

Select your MARC flavor

+
+ + +

+ [% FOREACH flavourloo IN flavourloop %] +

+ [% IF ( flavourloo.checked ) %] + [% flavourloo.label %]
+ [% ELSE %] + [% flavourloo.label %]
+ [% END %] +
+ [% END %] +

+

Click 'Next' to continue

+
+[% END %] + +[% IF ( selectframeworks ) %] +

Selecting Default Settings

+ +
+ + + + [% IF ( frameworksloop ) %] +

MARC frameworks: [% marcflavour %]

+ [% IF ( en_marc_frameworks ) %] +

No MARC frameworks are available for your language. + Defaulting to the frameworks supplied for English (en)

+ [% END %] + [% FOREACH frameworksloo IN frameworksloop %] +
+

[% frameworksloo.label %]

+ [% FOREACH framework IN frameworksloo.frameworks %] + + + + +
+ [% IF ( framework.checked ) %] + + [% ELSE %] + + [% END %] + + +
+ [% END %] +
+ [% END %] +

Other data

+ [% END %] + [% IF ( en_sample_data ) %] +

No sample data and settings are available for your language. + Defaulting to the samples supplied for English (en)

+ [% END %] + [% FOREACH levelloo IN levelloop %] +
+

[% levelloo.label %]

+ [% FOREACH framework IN levelloo.frameworks %] + + + + +
+ [% IF ( framework.checked ) %] + + [% ELSE %] + + [% END %] + + +
+ [% END %] +
+ [% END %] +

When you've made your selections, please click 'Import' below to begin the process. It may take a while to complete, + please be patient.

+

+

+
+[% END %] + + +[% IF ( addframeworks ) %] + [% FOREACH lis IN list %] +

[% lis.level %] data added

+ + [% END %] +

All done!

+

Installation complete.
+

Click on 'Finish' to complete and load the Koha Staff Interface. +

+ + +
+

+

+[% END %] + + +[% IF ( importdatastructure ) %] + [% IF ( error ) %] +

The following error occurred while importing the database structure:

+

[% error %]

+

Please contact your system administrator

+ [% ELSE %] +

Success

+ +
+ +

Click 'Next' to continue

+
+ [% END %] +[% END %] + + +[% IF ( proposeimport ) %] +

Now we're ready to create the database tables and fill them with some default data.

+
+ + +

Click 'Next' to continue

+
+[% END %] + + +[% IF ( default ) %] + [% IF ( upgrading ) %] +

+ We are upgrading from Koha [% dbversion %] to [% kohaversion %], you must update your database +

+ [% ELSE %] +

We are ready to do some basic configuration. Please install some basic configuration settings to continue the installation: +
+
+ +

+ [% END %] +[% END %] + + + +[% IF ( updatestructure ) %] +

Updating database structure

+ [% IF ( has_update_succeeds ) %] +

Update report :

+ + [% END %] + [% IF ( has_update_errors ) %] +

Update errors :

+ + [% END %] + [% UNLESS ( has_update_errors ) %] +

Everything went OK, update done.

+ [% END %] +Continue to log in to Koha +
+[% END %] + +
+ + --- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt @@ -2,7 +2,7 @@ [% IF ( finish ) %][% END %] [% INCLUDE 'installer-doc-head-close.inc' %]
-

Koha Web installer › Step 3

+

Koha Koha web installer › Step 3

[% IF ( selectframeworks ) %]
- [% IF ( frameworksloop ) %] -

MARC frameworks: [% marcflavour %]

- [% IF ( en_marc_frameworks ) %] -

No MARC frameworks are available for your language. - Defaulting to the frameworks supplied for English (en)

- [% END %] - [% FOREACH frameworksloo IN frameworksloop %] -
-

[% frameworksloo.label %]

- [% FOREACH framework IN frameworksloo.frameworks %] - - - - + [% IF ( frameworksloop ) %] +

MARC frameworks: [% marcflavour %]

+ [% IF ( en_marc_frameworks ) %] +

No MARC frameworks are available for your language. Defaulting to the frameworks supplied for English (en)

+ [% END %] + [% FOREACH frameworksloo IN frameworksloop %] +
+

[% frameworksloo.label %]

+ [% FOREACH framework IN frameworksloo.frameworks %] +
- [% IF ( framework.checked ) %] - - [% ELSE %] - - [% END %] - - -
+ + + + [% ELSE %] + + [% END %] +
+ [% IF (frameworksloo.label == "Default" ) %] + + [% ELSE %] + + [% END %] + + [% IF (frameworksloo.label == "Default" ) %] +
    + +
+
+ +
- [% END %] -
- [% END %] + [% END %] +
+ [% END %]

Other data

- [% END %] - [% IF ( en_sample_data ) %] -

No sample data and settings are available for your language. - Defaulting to the samples supplied for English (en)

- [% END %] + [% END %] + [% IF ( en_sample_data ) %] +

No sample data and settings ar e available for your language. + 132 Defaulting to the samples supplied for English (en)

+ [% END %] [% FOREACH levelloo IN levelloop %]

[% levelloo.label %]

@@ -138,18 +150,30 @@ + [% ELSE %] + + [% END %] +
- [% IF ( framework.checked ) %] - - [% ELSE %] - - [% END %] + [% IF (levelloo.label == "Default" ) %] + + [% ELSE %] + + [% END %] + [% IF (levelloo.label == "Default") %] +
    +
+
+
[% END %]
@@ -214,12 +238,15 @@ [% IF ( default ) %] [% IF ( upgrading ) %]

- We are upgrading from Koha [% dbversion %] to [% kohaversion %], you must update your database + We are upgrading from Koha [% dbversion %] to [% kohaversion %], you must update your database. +
+

[% ELSE %] -

We are ready to do some basic configuration. Please - install basic configuration settings - to continue the installation. +

We are ready to do some basic configuration. Please install some basic configuration settings to continue the installation: +
+
+

[% END %] [% END %] @@ -247,7 +274,7 @@ [% UNLESS ( has_update_errors ) %]

Everything went OK, update done.

[% END %] -Continue to log in to Koha + [% END %] --