From 85ab64ffb3126aba67cf33123aca397a6baa0a88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20V=C3=A9ron?= Date: Sun, 18 Oct 2015 18:27:58 +0200 Subject: [PATCH] Bug 12721 - Syspref StatisticsFields: Warning on About page and text change in System preferences This patch adds a warning to the about page if the syspref 'StatisticFields' is misconfigured. Additionally, the text on Home > Administration > SystemPreferences is changed. To test: - Apply patch - Edit syspref 'StatisticFields'. Verify that the explanation makes sense. - Leave field empty => verify that no message appears on About page, tab System information - Insert valid field names, e.g. location|itype => verify that no message appears on the About page - Add trailing char => verify that the warning message appears on the About page - Fill in some garbage or misspell a field name => verify that the warning message appears on the About page --- about.pl | 10 ++++++++++ koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 5 ++++- .../prog/en/modules/admin/preferences/patrons.pref | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/about.pl b/about.pl index 4c27366..c8069c7 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 '####'; @@ -66,6 +67,14 @@ $apacheVersion = `httpd -v 2> /dev/null` unless $apacheVersion; my $zebraVersion = `zebraidx -V`; # 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) ); @@ -264,6 +273,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 b7cbfbd..39effaf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt @@ -101,7 +101,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.

@@ -128,6 +128,9 @@ [% IF warnNoActiveCurrency %] Warning No active currency is defined. Please go to Administration > Currencies and exchange rates and mark one currency as active. [% END %] + [% IF warnStatisticsFieldsError %] + Warning System preference 'StatisticsFields' contains field names not belonging to the items database table: [% warnStatisticsFieldsError %] + [% END %] [% IF QueryParserError %] 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 a0e8587..1f65fe3 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 |). If empty defaults to: location|itype|ccode" - - pref: EnableBorrowerFiles choices: -- 1.7.10.4