diff --git a/about.pl b/about.pl index 4bf9779fc4..45372288c6 100755 --- a/about.pl +++ b/about.pl @@ -36,6 +36,7 @@ use C4::Installer; use Koha; use Koha::Borrowers; use Koha::Config::SysPrefs; +use C4::Members::Statistics; #use Smart::Comments '####'; @@ -69,6 +70,14 @@ if ( any { /(^psgi\.|^plack\.)/i } keys %ENV ) { } # Additional system information for warnings + +my $warnStatisticsFieldsError; +my $prefStatisticsFields = C4::Context->preference('StatisticsFields'); +if ($prefStatisticsFields) { + $warnStatisticsFieldsError = $prefStatisticsFields + unless ( $prefStatisticsFields eq C4::Members::Statistics->get_fields() ); +} + my $prefAutoCreateAuthorities = C4::Context->preference('AutoCreateAuthorities'); my $prefBiblioAddsAuthorities = C4::Context->preference('BiblioAddsAuthorities'); my $warnPrefBiblioAddsAuthorities = ( $prefAutoCreateAuthorities && ( !$prefBiblioAddsAuthorities) ); @@ -269,6 +278,7 @@ $template->param( warnIsRootUser => $warnIsRootUser, warnNoActiveCurrency => $warnNoActiveCurrency, xml_config_warnings => \@xml_config_warnings, + warnStatisticsFieldsError => $warnStatisticsFieldsError, ); my @components = (); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt index 34c880b5e0..fb7a265f56 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt @@ -104,7 +104,7 @@
[% IF warnPrefBiblioAddsAuthorities || warnPrefEasyAnalyticalRecords || warnPrefAnonymousPatron || - warnNoActiveCurrency || QueryParserError || warnIsRootUser || xml_config_warnings.size || AutoSelfCheckPatronDoesNotHaveSelfCheckPerm || AutoSelfCheckPatronHasTooManyPerm %] + warnNoActiveCurrency || QueryParserError || warnIsRootUser || xml_config_warnings.size || AutoSelfCheckPatronDoesNotHaveSelfCheckPerm || AutoSelfCheckPatronHasTooManyPerm || warnStatisticsFieldsError %] [% IF (warnIsRootUser) %]

Warning regarding current user

You are logged in as the database administrative user. This is not recommended because some parts of Koha will not function as expected when using this account.

@@ -112,7 +112,7 @@ [% END %] [% IF warnPrefBiblioAddsAuthorities || warnPrefEasyAnalyticalRecords || warnPrefAnonymousPatron || - warnNoActiveCurrency || QueryParserError || AutoSelfCheckPatronDoesNotHaveSelfCheckPerm || AutoSelfCheckPatronHasTooManyPerm %] + warnNoActiveCurrency || QueryParserError || AutoSelfCheckPatronDoesNotHaveSelfCheckPerm || AutoSelfCheckPatronHasTooManyPerm || warnStatisticsFieldsError%]

Warnings regarding the system configuration

@@ -131,6 +131,9 @@ [% IF warnNoActiveCurrency %] [% END %] + [% IF warnStatisticsFieldsError %] + + [% END %] [% IF QueryParserError %]
Preferences and parameters
Warning No active currency is defined. Please go to Administration > Currencies and exchange rates and mark one currency as active.
Warning System preference 'StatisticsFields' contains field names not belonging to the items database table: [% warnStatisticsFieldsError %]
Warning You have set UseQueryParser but there was a problem inititializing QueryParser. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref index 42e4d39855..33270cf37c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref @@ -129,7 +129,7 @@ Patrons: - "Show the following fields from the items database table as columns on the statistics tab on the patron record: " - pref: StatisticsFields class: multi - - (separate fields with |) + - "(separate fields with |, without trailing |). Default if empty: location|itype|ccode" - - pref: EnableBorrowerFiles choices: