From 5f6fe6e24db94516f2dd942b9f41f1f245b9cdba 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] [SIGNED-OFF] 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 'StatisticsFields' is misconfigured. Additionally, the text on Home > Administration > SystemPreferences for 'Statistics Fields' is changed. To test: - Apply patch - Edit syspref 'StatisticsFields'. 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 Signed-off-by: Aleisha --- about.pl | 10 ++++++++++ koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 7 +++++-- .../prog/en/modules/admin/preferences/patrons.pref | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/about.pl b/about.pl index 6b77677..ca8ff9f 100755 --- a/about.pl +++ b/about.pl @@ -37,6 +37,7 @@ use Koha; use Koha::Acquisition::Currencies; use Koha::Patrons; use Koha::Config::SysPrefs; +use C4::Members::Statistics; #use Smart::Comments '####'; @@ -70,6 +71,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) ); @@ -270,6 +279,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 a7663d1..e22c672 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 22c2b27..b4b2a1c 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: -- 1.7.10.4