Attachment #50668 for bug #12721

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

Lines 37-42 use Koha; Link Here

(-)a/about.pl (+10 lines)
37	use Koha::Acquisition::Currencies;	37	use Koha::Acquisition::Currencies;
38	use Koha::Patrons;	38	use Koha::Patrons;
39	use Koha::Config::SysPrefs;	39	use Koha::Config::SysPrefs;
		40	use C4::Members::Statistics;
40		41
41	#use Smart::Comments '####';	42	#use Smart::Comments '####';
42		43
Lines 70-75 if ( any { /(^psgi\.\|^plack\.)/i } keys %ENV ) { Link Here
70	}	71	}
71		72
72	# Additional system information for warnings	73	# Additional system information for warnings
		74
		75	my $warnStatisticsFieldsError;
		76	my $prefStatisticsFields = C4::Context->preference('StatisticsFields');
		77	if ($prefStatisticsFields) {
		78	$warnStatisticsFieldsError = $prefStatisticsFields
		79	unless ( $prefStatisticsFields eq C4::Members::Statistics->get_fields() );
		80	}
		81
73	my $prefAutoCreateAuthorities = C4::Context->preference('AutoCreateAuthorities');	82	my $prefAutoCreateAuthorities = C4::Context->preference('AutoCreateAuthorities');
74	my $prefBiblioAddsAuthorities = C4::Context->preference('BiblioAddsAuthorities');	83	my $prefBiblioAddsAuthorities = C4::Context->preference('BiblioAddsAuthorities');
75	my $warnPrefBiblioAddsAuthorities = ( $prefAutoCreateAuthorities && ( !$prefBiblioAddsAuthorities) );	84	my $warnPrefBiblioAddsAuthorities = ( $prefAutoCreateAuthorities && ( !$prefBiblioAddsAuthorities) );
Lines 270-275 $template->param( Link Here
270	warnIsRootUser => $warnIsRootUser,	279	warnIsRootUser => $warnIsRootUser,
271	warnNoActiveCurrency => $warnNoActiveCurrency,	280	warnNoActiveCurrency => $warnNoActiveCurrency,
272	xml_config_warnings => \@xml_config_warnings,	281	xml_config_warnings => \@xml_config_warnings,
		282	warnStatisticsFieldsError => $warnStatisticsFieldsError,
273	);	283	);
274		284
275	my @components = ();	285	my @components = ();

Lines 104-110 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt (-2 / +5 lines)
104		104
105	<div id="sysinfo">	105	<div id="sysinfo">
106	[% IF warnPrefBiblioAddsAuthorities \|\| warnPrefEasyAnalyticalRecords \|\| warnPrefAnonymousPatron \|\|	106	[% IF warnPrefBiblioAddsAuthorities \|\| warnPrefEasyAnalyticalRecords \|\| warnPrefAnonymousPatron \|\|
107	warnNoActiveCurrency \|\| QueryParserError \|\| warnIsRootUser \|\| xml_config_warnings.size \|\| AutoSelfCheckPatronDoesNotHaveSelfCheckPerm \|\| AutoSelfCheckPatronHasTooManyPerm %]	107	warnNoActiveCurrency \|\| QueryParserError \|\| warnIsRootUser \|\| xml_config_warnings.size \|\| AutoSelfCheckPatronDoesNotHaveSelfCheckPerm \|\| AutoSelfCheckPatronHasTooManyPerm \|\| warnStatisticsFieldsError %]
108	[% IF (warnIsRootUser) %]	108	[% IF (warnIsRootUser) %]
109	<h2>Warning regarding current user</h2>	109	<h2>Warning regarding current user</h2>
110	<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>	110	<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 112-118 Link Here
112	[% END %]	112	[% END %]
113		113
114	[% IF warnPrefBiblioAddsAuthorities \|\| warnPrefEasyAnalyticalRecords \|\| warnPrefAnonymousPatron \|\|	114	[% IF warnPrefBiblioAddsAuthorities \|\| warnPrefEasyAnalyticalRecords \|\| warnPrefAnonymousPatron \|\|
115	warnNoActiveCurrency \|\| QueryParserError \|\| AutoSelfCheckPatronDoesNotHaveSelfCheckPerm \|\| AutoSelfCheckPatronHasTooManyPerm %]	115	warnNoActiveCurrency \|\| QueryParserError \|\| AutoSelfCheckPatronDoesNotHaveSelfCheckPerm \|\| AutoSelfCheckPatronHasTooManyPerm \|\| warnStatisticsFieldsError%]
116	<h2>Warnings regarding the system configuration</h2>	116	<h2>Warnings regarding the system configuration</h2>
117	<table>	117	<table>
118	<caption>Preferences and parameters</caption>	118	<caption>Preferences and parameters</caption>
Lines 131-136 Link Here
131	[% IF warnNoActiveCurrency %]	131	[% IF warnNoActiveCurrency %]
132	<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 > Currencies and exchange rates</a> and mark one currency as active.</td></tr>	132	<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 > Currencies and exchange rates</a> and mark one currency as active.</td></tr>
133	[% END %]	133	[% END %]
		134	[% IF warnStatisticsFieldsError %]
		135	<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>
		136	[% END %]
134	[% IF QueryParserError %]	137	[% IF QueryParserError %]
135	<tr><th scope="row"><b>Warning</b> </th><td>	138	<tr><th scope="row"><b>Warning</b> </th><td>
136	You have set UseQueryParser but there was a problem inititializing QueryParser.	139	You have set UseQueryParser but there was a problem inititializing QueryParser.

Lines 129-135 Patrons: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref (-2 / +1 lines)
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 \|). Default if empty: location\|itype\|ccode"
133	-	133	-
134	- pref: EnableBorrowerFiles	134	- pref: EnableBorrowerFiles
135	choices:	135	choices:
136	-

Return to bug 12721