View | Details | Raw Unified | Return to bug 12721
Collapse All | Expand All

(-)a/about.pl (+10 lines)
Lines 36-41 use C4::Installer; Link Here
36
use Koha;
36
use Koha;
37
use Koha::Borrowers;
37
use Koha::Borrowers;
38
use Koha::Config::SysPrefs;
38
use Koha::Config::SysPrefs;
39
use C4::Members::Statistics;
39
40
40
#use Smart::Comments '####';
41
#use Smart::Comments '####';
41
42
Lines 66-71 $apacheVersion = `httpd -v 2> /dev/null` unless $apacheVersion; Link Here
66
my $zebraVersion = `zebraidx -V`;
67
my $zebraVersion = `zebraidx -V`;
67
68
68
# Additional system information for warnings
69
# Additional system information for warnings
70
71
my $warnStatisticsFieldsError;
72
my $prefStatisticsFields = C4::Context->preference('StatisticsFields');
73
if ($prefStatisticsFields) {
74
    $warnStatisticsFieldsError = $prefStatisticsFields
75
        unless ( $prefStatisticsFields eq  C4::Members::Statistics->get_fields() );
76
}
77
69
my $prefAutoCreateAuthorities = C4::Context->preference('AutoCreateAuthorities');
78
my $prefAutoCreateAuthorities = C4::Context->preference('AutoCreateAuthorities');
70
my $prefBiblioAddsAuthorities = C4::Context->preference('BiblioAddsAuthorities');
79
my $prefBiblioAddsAuthorities = C4::Context->preference('BiblioAddsAuthorities');
71
my $warnPrefBiblioAddsAuthorities = ( $prefAutoCreateAuthorities && ( !$prefBiblioAddsAuthorities) );
80
my $warnPrefBiblioAddsAuthorities = ( $prefAutoCreateAuthorities && ( !$prefBiblioAddsAuthorities) );
Lines 264-269 $template->param( Link Here
264
    warnIsRootUser => $warnIsRootUser,
273
    warnIsRootUser => $warnIsRootUser,
265
    warnNoActiveCurrency => $warnNoActiveCurrency,
274
    warnNoActiveCurrency => $warnNoActiveCurrency,
266
    xml_config_warnings => \@xml_config_warnings,
275
    xml_config_warnings => \@xml_config_warnings,
276
    warnStatisticsFieldsError => $warnStatisticsFieldsError,
267
);
277
);
268
278
269
my @components = ();
279
my @components = ();
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt (-1 / +4 lines)
Lines 101-107 Link Here
101
101
102
        <div id="sysinfo">
102
        <div id="sysinfo">
103
    [% IF warnPrefBiblioAddsAuthorities || warnPrefEasyAnalyticalRecords || warnPrefAnonymousPatron ||
103
    [% IF warnPrefBiblioAddsAuthorities || warnPrefEasyAnalyticalRecords || warnPrefAnonymousPatron ||
104
          warnNoActiveCurrency || QueryParserError || warnIsRootUser || xml_config_warnings.size || AutoSelfCheckPatronDoesNotHaveSelfCheckPerm || AutoSelfCheckPatronHasTooManyPerm %]
104
          warnNoActiveCurrency || QueryParserError || warnIsRootUser || xml_config_warnings.size || AutoSelfCheckPatronDoesNotHaveSelfCheckPerm || AutoSelfCheckPatronHasTooManyPerm || warnStatisticsFieldsError %]
105
        [% IF (warnIsRootUser) %]
105
        [% IF (warnIsRootUser) %]
106
            <h2>Warning regarding current user</h2>
106
            <h2>Warning regarding current user</h2>
107
            <p>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.</p>
107
            <p>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.</p>
Lines 128-133 Link Here
128
                [% IF warnNoActiveCurrency %]
128
                [% IF warnNoActiveCurrency %]
129
                    <tr><th scope="row"><b>Warning</b> </th><td>No active currency is defined. Please go to <a href="/cgi-bin/koha/admin/currency.pl">Administration &gt; Currencies and exchange rates</a> and mark one currency as active.</td></tr>
129
                    <tr><th scope="row"><b>Warning</b> </th><td>No active currency is defined. Please go to <a href="/cgi-bin/koha/admin/currency.pl">Administration &gt; Currencies and exchange rates</a> and mark one currency as active.</td></tr>
130
                [% END %]
130
                [% END %]
131
                [% IF warnStatisticsFieldsError %]
132
                    <tr><th scope="row"><b>Warning</b> </th><td>System preference 'StatisticsFields' contains field names not belonging to the items database table: [% warnStatisticsFieldsError %] </td></tr>
133
                [% END %]
131
                [% IF QueryParserError %]
134
                [% IF QueryParserError %]
132
                    <tr><th scope="row"><b>Warning</b> </th><td>
135
                    <tr><th scope="row"><b>Warning</b> </th><td>
133
                        You have set UseQueryParser but there was a problem inititializing QueryParser.
136
                        You have set UseQueryParser but there was a problem inititializing QueryParser.
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref (-2 / +1 lines)
Lines 129-135 Patrons: Link Here
129
         - "Show the following fields from the items database table as columns on the statistics tab on the patron record: "
129
         - "Show the following fields from the items database table as columns on the statistics tab on the patron record: "
130
         - pref: StatisticsFields
130
         - pref: StatisticsFields
131
           class: multi
131
           class: multi
132
         - (separate fields with |)
132
         - "(separate fields with |, without trailing |). If empty defaults to: location|itype|ccode"
133
     -
133
     -
134
         - pref: EnableBorrowerFiles
134
         - pref: EnableBorrowerFiles
135
           choices:
135
           choices:
136
- 

Return to bug 12721