From 2dada820209a09f7319fcc1872690a7af021b709 Mon Sep 17 00:00:00 2001 From: Alex Buckley Date: Thu, 28 Sep 2017 14:10:56 +0000 Subject: [PATCH] Bug 19247 - Working on displaying the values of the system preferences in correct format Sponsored-By: Catalyst IT --- admin/preferences.pl | 4 +- ...g_version_column_to_systempreferences_table.sql | 84 +++++++++++----------- installer/featurereleasetool.pl | 34 ++++++--- installer/install.pl | 6 +- .../en/modules/installer/featurereleasetool.tt | 72 ++++++++++++++++--- .../prog/en/modules/installer/step3.tt | 1 + 6 files changed, 139 insertions(+), 62 deletions(-) diff --git a/admin/preferences.pl b/admin/preferences.pl index 16fa2fd..04e752a 100755 --- a/admin/preferences.pl +++ b/admin/preferences.pl @@ -165,7 +165,8 @@ sub TransformPrefsToHTML { } else { $value = $row->{'value'}; } - my $chunk = _get_chunk( $value, %$piece ); + my $source = "preferences"; + my $chunk = _get_chunk( $value, $source, %$piece ); # No highlighting of inputs yet, but would be useful $chunk->{'highlighted'} = 1 if ( $searchfield && $name =~ /^$searchfield$/i ); @@ -225,6 +226,7 @@ sub SearchPrefs { my ( $input, $searchfield ) = @_; my @tabs; + warn $input, $searchfield; my %tab_files = _get_pref_files( $input ); our @terms = split( /\s+/, $searchfield ); diff --git a/installer/data/mysql/atomicupdate/18645_adding_version_column_to_systempreferences_table.sql b/installer/data/mysql/atomicupdate/18645_adding_version_column_to_systempreferences_table.sql index b89f681..7004aa2 100644 --- a/installer/data/mysql/atomicupdate/18645_adding_version_column_to_systempreferences_table.sql +++ b/installer/data/mysql/atomicupdate/18645_adding_version_column_to_systempreferences_table.sql @@ -1,66 +1,68 @@ ALTER TABLE systempreferences ADD version varchar(12) DEFAULT NULL; +ALTER TABLE systempreferences ADD display_choices mediumtext DEFAULT NULL; UPDATE systempreferences SET version="16.06.00.003" WHERE variable ="MaxItemsToProcessForBatchMod"; UPDATE systempreferences SET version="16.06.00.003" WHERE variable ="MaxItemsToDisplayForBatchDel"; UPDATE systempreferences SET version="16.06.00.004" WHERE variable ="OPACXSLTListsDisplay"; UPDATE systempreferences SET version="16.06.00.004" WHERE variable ="XSLTListsDisplay"; UPDATE systempreferences SET version="16.06.00.005" WHERE variable ="XSLTListsDisplay"; -UPDATE systempreferences SET version="16.06.00.006" WHERE variable="RefundLostOnReturnControl"; +UPDATE systempreferences SET version="16.06.00.006", display_choices="check-in library.|item home branch.|item holding branch." WHERE variable="RefundLostOnReturnControl"; UPDATE systempreferences SET version="16.06.00.007" WHERE variable="PatronQuickAddFields"; -UPDATE systempreferences SET version="16.06.00.008" WHERE variable="CheckPrevCheckout"; -UPDATE systempreferences SET version="16.06.00.009" WHERE variable="IntranetCatalogSearchPulldown"; +UPDATE systempreferences SET version="16.06.00.008", display_choices="Do|Unless overridden, do|Unless overridden, do not|Do not" WHERE variable="CheckPrevCheckout"; +UPDATE systempreferences SET version="16.06.00.009", display_choices="Don't show|Show" WHERE variable="IntranetCatalogSearchPulldown"; UPDATE systempreferences SET version="16.06.00.010" WHERE variable="MaxOpenSuggestions"; -UPDATE systempreferences SET version="16.06.00.011" WHERE variable="NovelistSelectStaffEnabled"; -UPDATE systempreferences SET version="16.06.00.011" WHERE variable="NovelistSelectStaffView"; -UPDATE systempreferences SET version="16.06.00.013" WHERE variable="OPACResultsLibrary"; -UPDATE systempreferences SET version="16.06.00.015" WHERE variable="HoldsLog"; -UPDATE systempreferences SET version="16.06.00.020" WHERE variable="SwitchOnSiteCheckouts"; -UPDATE systempreferences SET version="16.06.00.027" WHERE variable="TrackLastPatronActivity"; -UPDATE systempreferences SET version="16.06.00.021" WHERE variable="PatronSelfRegistrationEmailMustBeUnique"; +UPDATE systempreferences SET version="16.06.00.011", display_choices="Don't add|add" WHERE variable="NovelistSelectStaffEnabled"; +UPDATE systempreferences SET version="16.06.00.011", display_choices="in a tab|above the holdings table|below the holdings table" WHERE variable="NovelistSelectStaffView"; +UPDATE systempreferences SET version="16.06.00.013", display_choices="home library|current location" WHERE variable="OPACResultsLibrary"; +UPDATE systempreferences SET version="16.06.00.015", display_choices="Don't log|Log" WHERE variable="HoldsLog"; +UPDATE systempreferences SET version="16.06.00.020", display_choices="Don't switch|Switch" WHERE variable="SwitchOnSiteCheckouts"; +UPDATE systempreferences SET version="16.06.00.027", display_choices="Don't|Do" WHERE variable="TrackLastPatronActivity"; +UPDATE systempreferences SET version="16.06.00.021", display_choices="Do not consider|Consider" WHERE variable="PatronSelfRegistrationEmailMustBeUnique"; UPDATE systempreferences SET version="16.06.00.023" WHERE variable="timeout"; -UPDATE systempreferences SET version="16.06.00.025" WHERE variable="makePreviousSerialAvailable"; +UPDATE systempreferences SET version="16.06.00.025", display_choices="Do not make|Make" WHERE variable="makePreviousSerialAvailable"; UPDATE systempreferences SET version="16.06.00.026" WHERE variable="PatronSelfRegistrationLibraryList"; -UPDATE systempreferences SET version="16.06.00.027" WHERE variable="TrackLastPatronActivity"; -UPDATE systempreferences SET version="16.06.00.029" WHERE variable="UsageStatsLibraryType"; -UPDATE systempreferences SET version="16.06.00.029" WHERE variable="UsageStatsCountry"; -UPDATE systempreferences SET version="16.06.00.030" WHERE variable="OPACHoldingsDefaultSortField"; -UPDATE systempreferences SET version="16.06.00.031" WHERE variable="PatronSelfRegistrationPrefillForm"; -UPDATE systempreferences SET version="16.06.00.035" WHERE variable="AllowItemsOnHoldCheckoutSCO"; -UPDATE systempreferences SET version="16.06.00.036" WHERE variable="HouseboundModule"; -UPDATE systempreferences SET version="16.06.00.037" WHERE variable="ArticleRequests"; -UPDATE systempreferences SET version="16.06.00.037" WHERE variable="ArticleRequestsMandatoryFields"; -UPDATE systempreferences SET version="16.06.00.037" WHERE variable="ArticleRequestsMandatoryFieldsItemsOnly"; -UPDATE systempreferences SET version="16.06.00.037" WHERE variable="ArticleRequestsMandatoryFieldsRecordOnly"; -UPDATE systempreferences SET version="16.06.00.038" WHERE variable="DefaultPatronSearchFields"; -UPDATE systempreferences SET version="16.06.00.041" WHERE variable="AggressiveMatchOnISSN"; -UPDATE systempreferences SET version="16.06.00.045" WHERE variable="BorrowerRenewalPeriodBase"; +UPDATE systempreferences SET version="16.06.00.027", display_choices="Don't|Do" WHERE variable="TrackLastPatronActivity"; +UPDATE systempreferences SET version="16.06.00.029", display_choices="public|school|academic|research|private|society or association|corporate|government|religious organization|subscription" WHERE variable="UsageStatsLibraryType"; +UPDATE systempreferences SET version="16.06.00.029", options="Afghanistan|Albania|Algeria|Andorra|Angola|Angitua & Deps|Argentina|Armenia|Australia|Austria|Azerbaijan|Bahamas|Bahrain|Bangladesh|Barbados|Belarus|Barbados|Belgium|Beliza|Benin|Bhutan|Bolizia|Bosnia Herz.|Botswana|Brazil|Brunei|Bulgaria|Burkina|Burundi|Cambodia|Cameroon|Canada|Capre Verde|Centr. Afr. Rep|Chad|Chile|China|Colombia|Comoros|Congo|Costa Rica|Croatia|Cuba|Cyprus|Czeck Rpublic|Denmark|Djibouti|Dominica|Dominican Rep.|East Timor|Ecuador|Egypt|El Salvador|Equator. Guinea|Eritrea|Estonia|Ethiopia|Fiji|Finland|France|Gabon|Gambia|Georgia|Germany|Ghana|Greece|Grenada|Guatemala|Guinea|Guinea-Bissau|Guyana|Haiti|Honduras|Hungary|Iceland|India|Indonesia|Iran|Iraq|Ireland|Isreal|Italy|Ivory Coast|Jamaica|Japan|Jordan|Kazakhstan|Kenya|Kiribati|Korea North|Korea South|Kosovo|Kuwait|Kyrgyzstan|Laos|Latvia|Lebanon|Lesotho|Liberia|Libya|Liechtenstein|Lithuania|Luxembourg|Macedonia|Madagascar|Malawi|Malyasia|Maldives|Mali|Malta|Marshall Isl.|Mauritania|Mauritius|Mexico|Micronesia|Moldova|Monaco|Mongolia|Montenegro|Morocco|Mozambique|Myanmar|Namibia|Nauru|Nepal|Netherlands|New Zealand|Nicaragua|Niger|Nigeria|Norway|Oman|Pakistan|Palau|Papua N. Guinea|Paraguay|Peru|Philippines|Poland|Portugal|Qatar|Romania|Russian Fed.|Rwanada|St Kitts & Nev.|St Lucia|St Vincent|Samoa|San Marino|Sao Tome|Saudi Arabia|Senegal|Serbia|Seychelles|Sierra Leone|Singapore|Slovakia|Slovenia|Solomon Islands|Somalia|South Africa|Spain|Sri Lanka|Sudan|Suriname|Swaziland|Sweden|Switzerland|Syria|Taiwan|Tajikistan|Tanzania|Thailand|Togo|Tonga|Trinidad & Tob.|Tunisia|Turkey|Turkmenistan|Tuvalu|Uganda|Ukraine|UAE|United Kingdom|USA|Uruguay|Uzbekistan|Vanuatu|Vatican City|Venezuela|Vietnam|Yemen|Zambia|Zimbabwe", display_choices="Afghanistan|Albania|Algeria|Andorra|Angola|Angitua & Deps|Argentina|Armenia|Australia|Austria|Azerbaijan|Bahamas|Bahrain|Bangladesh|Barbados|Belarus|Barbados|Belgium|Beliza|Benin|Bhutan|Bolizia|Bosnia Herz.|Botswana|Brazil|Brunei|Bulgaria|Burkina|Burundi|Cambodia|Cameroon|Canada|Capre Verde|Centr. Afr. Rep|Chad|Chile|China|Colombia|Comoros|Congo|Costa Rica|Croatia|Cuba|Cyprus|Czeck Rpublic|Denmark|Djibouti|Dominica|Dominican Rep.|East Timor|Ecuador|Egypt|El Salvador|Equator. Guinea|Eritrea|Estonia|Ethiopia|Fiji|Finland|France|Gabon|Gambia|Georgia|Germany|Ghana|Greece|Grenada|Guatemala|Guinea|Guinea-Bissau|Guyana|Haiti|Honduras|Hungary|Iceland|India|Indonesia|Iran|Iraq|Ireland|Isreal|Italy|Ivory Coast|Jamaica|Japan|Jordan|Kazakhstan|Kenya|Kiribati|Korea North|Korea South|Kosovo|Kuwait|Kyrgyzstan|Laos|Latvia|Lebanon|Lesotho|Liberia|Libya|Liechtenstein|Lithuania|Luxembourg|Macedonia|Madagascar|Malawi|Malyasia|Maldives|Mali|Malta|Marshall Isl.|Mauritania|Mauritius|Mexico|Micronesia|Moldova|Monaco|Mongolia|Montenegro|Morocco|Mozambique|Myanmar|Namibia|Nauru|Nepal|Netherlands|New Zealand|Nicaragua|Niger|Nigeria|Norway|Oman|Pakistan|Palau|Papua N. Guinea|Paraguay|Peru|Philippines|Poland|Portugal|Qatar|Romania|Russian Fed.|Rwanada|St Kitts & Nev.|St Lucia|Saint Vincent|Samoa|San Marino|Sao Tome|Saudi Arabia|Senegal|Serbia|Seychelles|Sierra Leone|Singapore|Slovakia|Slovenia|Solomon Islands|Somalia|South Africa|Spain|Sri Lanka|Sudan|Suriname|Swaziland|Sweden|Switzerland|Syria|Taiwan|Tajikistan|Tanzania|Thailand|Togo|Tonga|Trinidad & Tob.|Tunisia|Turkey|Turkmenistan|Tuvalu|Uganda|Ukraine|UAE|United Kingdom|USA|Uruguay|Uzbekistan|Vanuatu|Vatican City|Venezuela|Vietnam|Yemen|Zambia|Zimbabwe" WHERE variable="UsageStatsCountry"; +UPDATE systempreferences SET version="16.06.00.030", display_choices="First column of the table|Home library|Holding library" WHERE variable="OPACHoldingsDefaultSortField"; +UPDATE systempreferences SET version="16.06.00.031", display_choices="Do not display and prefill|Display and prefill" WHERE variable="PatronSelfRegistrationPrefillForm"; +UPDATE systempreferences SET version="16.06.00.035", display_choices="Don't allow|Allow" WHERE variable="AllowItemsOnHoldCheckoutSCO"; +UPDATE systempreferences SET version="16.06.00.036", display_choices="Disable|Enable" WHERE variable="HouseboundModule"; +UPDATE systempreferences SET version="16.06.00.037", display_choices="Don't enable|Enable" WHERE variable="ArticleRequests"; +UPDATE systempreferences SET version="16.06.00.037", display_choices="Title|Author|Volume|Issue|Date|Pages|Chapters" WHERE variable="ArticleRequestsMandatoryFields"; +UPDATE systempreferences SET version="16.06.00.037", display_choices="Title|Author|Volume|Issue|Date|Pages|Chapters" WHERE variable="ArticleRequestsMandatoryFieldsItemsOnly"; +UPDATE systempreferences SET version="16.06.00.037", display_choices="Title|Author|Volume|Issue|Date|Pages|Chapters" WHERE variable="ArticleRequestsMandatoryFieldsRecordOnly"; +UPDATE systempreferences SET version="16.06.00.038", display_choices="surname,firstname,othernames,cardnumber,userid" WHERE variable="DefaultPatronSearchFields"; +UPDATE systempreferences SET version="16.06.00.041", display_choices="don't|do" WHERE variable="AggressiveMatchOnISSN"; +UPDATE systempreferences SET version="16.06.00.045", display_choices="current membership expiry date.|current date.|the latter of the current and expiry date." WHERE variable="BorrowerRenewalPeriodBase"; UPDATE systempreferences SET version="16.06.00.049" WHERE variable="ReplytoDefault"; UPDATE systempreferences SET version="16.06.00.049" WHERE variable="ReturnpathDefault"; -UPDATE systempreferences SET version="16.12.00.005" WHERE variable="AuthorityMergeMode"; +UPDATE systempreferences SET version="16.12.00.005", display_choices="loose|strict" WHERE variable="AuthorityMergeMode"; UPDATE systempreferences SET version="16.12.00.008" WHERE variable="MarcItemFieldsToOrder"; -UPDATE systempreferences SET version="16.12.00.009" WHERE variable="OPACHoldsIfAvailableAtPickup"; +UPDATE systempreferences SET version="16.12.00.009", display_choices="Don't allow|Allow" WHERE variable="OPACHoldsIfAvailableAtPickup"; UPDATE systempreferences SET version="16.12.00.009" WHERE variable="OPACHoldsIfAvailableAtPickupExceptions"; -UPDATE systempreferences SET version="16.12.00.010" WHERE variable="OverDriveCirculation"; -UPDATE systempreferences SET version="16.12.00.012" WHERE variable="OpacNewsLibrarySelect"; -UPDATE systempreferences SET version="16.12.00.013" WHERE variable="CircSidebar"; -UPDATE systempreferences SET version="16.12.00.014" WHERE variable="LoadSearchHistoryToTheFirstLoggedUser"; +UPDATE systempreferences SET version="16.12.00.010", display_choices="Don't enable|Enable" WHERE variable="OverDriveCirculation"; +UPDATE systempreferences SET version="16.12.00.012", display_choices="Don't display|Display" WHERE variable="OpacNewsLibrarySelect"; +UPDATE systempreferences SET version="16.12.00.013", display_choices="Deactivate|Activate" WHERE variable="CircSidebar"; +UPDATE systempreferences SET version="16.12.00.014", display_choices="Don't load|Load" WHERE variable="LoadSearchHistoryToTheFirstLoggedUser"; UPDATE systempreferences SET version="16.12.00.015" WHERE variable="UsageStatsGeolocation"; -UPDATE systempreferences SET version="16.12.00.015" WHERE variable="UsageStatsLibrariesInfo"; +UPDATE systempreferences SET version="16.12.00.015", display_choices="Do not Share|Share" WHERE variable="UsageStatsLibrariesInfo"; UPDATE systempreferences SET version="16.12.00.015" WHERE variable="UsageStatsPublicID"; -UPDATE systempreferences SET version="16.12.00.017" WHERE variable="CumulativeRestrictionPeriods"; -UPDATE systempreferences SET version="16.12.00.020" WHERE variable="HoldFeeMode"; -UPDATE systempreferences SET version="16.12.00.021" WHERE variable="RenewalLog"; +UPDATE systempreferences SET version="16.12.00.017", display_choices="Don't cumulate|Cumulate" WHERE variable="CumulativeRestrictionPeriods"; +UPDATE systempreferences SET version="16.12.00.020", display_choices="any time a hold is placed.|only if all items are checked out and the record has at least one hold already.|any time a hold is collected." WHERE variable="HoldFeeMode"; +UPDATE systempreferences SET version="16.12.00.021", display_choices="Don't log|Log" WHERE variable="RenewalLog"; UPDATE systempreferences SET version="16.12.00.023" WHERE variable="AuthorityMergeLimit"; UPDATE systempreferences SET version="16.12.00.024" WHERE variable="OverdueNoticeBcc"; +UPDATE systempreferences SET version="16.12.00.024" WHERE variable="NoticeBcc"; UPDATE systempreferences SET version="16.12.00.025" WHERE variable="UploadPurgeTemporaryFilesDays"; -UPDATE systempreferences SET version="16.12.00.028" WHERE variable="AddressFormat"; -UPDATE systempreferences SET version="16.12.00.029" WHERE variable="AllowCheckoutNotes"; -UPDATE systempreferences SET version="16.12.00.032" WHERE variable="ExcludeHolidaysFromMaxPickUpDelay"; -UPDATE systempreferences SET version="16.12.00.033" WHERE variable="TranslateNotices"; -UPDATE systempreferences SET version="16.12.00.034" WHERE variable="OPACFineNoRenewalsBlockAutoRenew"; +UPDATE systempreferences SET version="16.12.00.028", display_choices="Germany style ([Address][Street number] - [ZIP/Postal Code] - [Country])|French style ([Street number][Address] - [ZIP/Postal COde][City] - [Country])|US style ([Street number], [Address] - [City], [ ZIP/Postal Code], [Country})" WHERE variable="AddressFormat"; +UPDATE systempreferences SET version="16.12.00.029", display_choices="Don't allow|Allow" WHERE variable="AllowCheckoutNotes"; +UPDATE systempreferences SET version="16.12.00.032", display_choices="Don't allow|Allow" WHERE variable="ExcludeHolidaysFromMaxPickUpDelay"; +UPDATE systempreferences SET version="16.12.00.033", display_choices="Don't allow|Allow" WHERE variable="TranslateNotices"; +UPDATE systempreferences SET version="16.12.00.034", display_choices="Block|Allow" WHERE variable="OPACFineNoRenewalsBlockAutoRenew"; UPDATE systempreferences SET version="16.12.00.036" WHERE variable="NumSavedReports"; UPDATE systempreferences SET version="16.12.00.037" WHERE variable="FailedLoginAttempts"; UPDATE systempreferences SET version="16.12.00.038" WHERE variable="ExportRemoveFields"; -UPDATE systempreferences SET version="16.12.00.039" WHERE variable="TalkingTechItivaPhoneNotification"; +UPDATE systempreferences SET version="16.12.00.039", display_choices="Disable|Enable" WHERE variable="TalkingTechItivaPhoneNotification"; diff --git a/installer/featurereleasetool.pl b/installer/featurereleasetool.pl index 88f24db..8c53d7a 100755 --- a/installer/featurereleasetool.pl +++ b/installer/featurereleasetool.pl @@ -34,7 +34,7 @@ use C4::NewsChannels; use Data::Dumper; use Koha::DateUtils; use Date::Calc qw/Date_to_Days Today/; - +our $lang; my $query = new CGI; my $step = $query->param('step'); @@ -106,16 +106,32 @@ my @prefsloop; my @lines = split /\n/, $file; foreach my $line (@lines) { my $query = qq| - SELECT variable, value, options, explanation from systempreferences WHERE version= ? |; + SELECT variable, value, options, display_choices, explanation, type from systempreferences WHERE version= ? |; my $sth = $dbh->prepare($query); $sth->execute($line); - while (my ($variable, $value, $options, $explanation) =$sth->fetchrow) { - push @prefsloop, { - variable => $variable, - value => $value, - options => $options, - explanation => $explanation, - }; + while (my ($variable, $value, $options, $display_choices, $explanation, $type) = $sth->fetchrow) { + if ($options) { + push @prefsloop, { + variable => $variable, + value => $value, + options => $options, + explanation => $explanation, + type => $type, + display_choices => $display_choices, + }; + foreach my $pref (@prefsloop) { + warn $pref->{variable}; + warn $pref->{display_choices}; + } + } else { + push @prefsloop, { + variable => $variable, + value => $value, + explanation => $explanation, + type => $type, + display_choices => $display_choices, + }; + } } }; diff --git a/installer/install.pl b/installer/install.pl index c3d31a4..47f5581 100755 --- a/installer/install.pl +++ b/installer/install.pl @@ -383,7 +383,7 @@ elsif ( $step && $step == 3 ) { my $now = POSIX::strftime( "%Y-%m-%dT%H:%M:%S", localtime() ); my $logdir = C4::Context->config('logdir'); - warn my $dbversion = C4::Context->preference('Version'); + my $dbversion = C4::Context->preference('Version'); my $kohaversion = Koha::version; $kohaversion =~ s/(.*\..*)\.(.*)\.(.*)/$1$2$3/; @@ -406,7 +406,7 @@ elsif ( $step && $step == 3 ) { my $fh; open( $fh, "<", $logfilepath ) or die "Cannot open log file $logfilepath: $!"; - warn my @report = <$fh>; + my @report = <$fh>; close $fh; if (@report) { $template->param( update_report => @@ -478,7 +478,7 @@ elsif ( $step && $step == 3 ) { # if there is none, then we need to install the database # if ( C4::Context->preference('Version') ) { - warn my $dbversion = C4::Context->preference('Version'); + my $dbversion = C4::Context->preference('Version'); $dbversion =~ /(.*)\.(..)(..)(...)/; $dbversion = "$1.$2.$3.$4"; $template->param( diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/featurereleasetool.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/featurereleasetool.tt index c1778a7..e81ad6d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/featurereleasetool.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/featurereleasetool.tt @@ -60,6 +60,21 @@ td, th { .preftitle { text-align:center; } + +.pref_text_input { + width: 90%; + height: 30px; +} + +.pref_binary_input { + width: 90%; + height: 30px; +} + +.pref_choice_input { + width: 90%; + height: 30px; +} [% IF ( finish ) %][% END %] @@ -77,9 +92,10 @@ td, th {
-

New sysprefs added to Koha since [% dbversion %]

+

New sysprefs added to Koha since Koha [% dbversion %]

-
+

The system preferences listed below were all installed in the update from Koha [% dbversion %] to Koha [% kohaversion %]. The default values of each of the system preferences is displayed for you to review and modify and submit by selecting the 'Save all preferences' button

+ @@ -95,12 +111,52 @@ td, th { [% END %] @@ -117,7 +173,7 @@ td, th { Koha 17.05 release notes link
-

Next and submit

+

Log into Koha staff intranet

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt index 9af8e6e..ec2807c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt @@ -247,6 +247,7 @@

Everything went okay. Update done.

[% END %]

Continue to feature release tool

+

Skip feature release tool and login to Koha

[% END # / IF updatestructure %] -- 2.1.4
[% pref.explanation %] + - [% IF (pref.value != '') %] - - [% ELSE %] - No default value - [% END %] + [% IF (pref.value != '') %] + [% IF (pref.type == "Integer") || (pref.type == "integer" ) || (pref.type == "Free") %] + + [% ELSIF (pref.type == "Choice") %] + + [% ELSIF (pref.type == "YesNo") %] + + [% END %] + [% ELSE %] + No default value + [% END %]