Attachment #38382 for bug #14024

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

Lines 33-38 use XML::Dumper; Link Here

(-)a/C4/Reports/Guided.pm (-1 / +5 lines)
33	use C4::Debug;	33	use C4::Debug;
34	# use Smart::Comments;	34	# use Smart::Comments;
35	# use Data::Dumper;	35	# use Data::Dumper;
		36	use C4::Log;
36		37
37	BEGIN {	38	BEGIN {
38	# set the version for version checking	39	# set the version for version checking
Lines 632-637 sub format_results { Link Here
632	sub delete_report {	633	sub delete_report {
633	my (@ids) = @_;	634	my (@ids) = @_;
634	return unless @ids;	635	return unless @ids;
		636	foreach my $id (@ids) {
		637	my $data = get_saved_report($id);
		638	logaction( "REPORTS", "DELETE", $id, "$data->{'report_name'} \| $data->{'savedsql'} " ) if C4::Context->preference("ReportsLog");
		639	}
635	my $dbh = C4::Context->dbh;	640	my $dbh = C4::Context->dbh;
636	my $query = 'DELETE FROM saved_sql WHERE id IN (' . join( ',', ('?') x @ids ) . ')';	641	my $query = 'DELETE FROM saved_sql WHERE id IN (' . join( ',', ('?') x @ids ) . ')';
637	my $sth = $dbh->prepare($query);	642	my $sth = $dbh->prepare($query);
Lines 639-645 sub delete_report { Link Here
639	}	644	}
640		645
641	sub get_saved_reports_base_query {	646	sub get_saved_reports_base_query {
642
643	my $area_name_sql_snippet = get_area_name_sql_snippet;	647	my $area_name_sql_snippet = get_area_name_sql_snippet;
644	return <<EOQ;	648	return <<EOQ;
645	SELECT s.*, r.report, r.date_run, $area_name_sql_snippet, av_g.lib AS groupname, av_sg.lib AS subgroupname,	649	SELECT s.*, r.report, r.date_run, $area_name_sql_snippet, av_g.lib AS groupname, av_sg.lib AS subgroupname,

Line 0 Link Here

(-)a/installer/data/mysql/atomicupdate/bug_14024_add_reportslog_syspref.sql (+1 lines)
	1	INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES ('ReportsLog','0',NULL,'If ON, log information about reports.','YesNo');

Lines 353-358 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here

(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
353	('RenewSerialAddsSuggestion','0',NULL,'If ON, adds a new suggestion at serial subscription renewal','YesNo'),	353	('RenewSerialAddsSuggestion','0',NULL,'If ON, adds a new suggestion at serial subscription renewal','YesNo'),
354	('RentalFeesCheckoutConfirmation', '0', NULL , 'Allow user to confirm when checking out an item with rental fees.', 'YesNo'),	354	('RentalFeesCheckoutConfirmation', '0', NULL , 'Allow user to confirm when checking out an item with rental fees.', 'YesNo'),
355	('RentalsInNoissuesCharge','1',NULL,'Rental charges block checkouts (added to noissuescharge).','YesNo'),	355	('RentalsInNoissuesCharge','1',NULL,'Rental charges block checkouts (added to noissuescharge).','YesNo'),
		356	('ReportsLog','0',NULL,'If ON, log information about reports.','YesNo'),
356	('RequestOnOpac','1',NULL,'If ON, globally enables patron holds on OPAC','YesNo'),	357	('RequestOnOpac','1',NULL,'If ON, globally enables patron holds on OPAC','YesNo'),
357	('ReservesControlBranch','PatronLibrary','ItemHomeLibrary\|PatronLibrary','Branch checked for members reservations rights','Choice'),	358	('ReservesControlBranch','PatronLibrary','ItemHomeLibrary\|PatronLibrary','Branch checked for members reservations rights','Choice'),
358	('ReservesMaxPickUpDelay','7','','Define the Maximum delay to pick up an item on hold','Integer'),	359	('ReservesMaxPickUpDelay','7','','Define the Maximum delay to pick up an item on hold','Integer'),

Lines 47-49 Logging: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/logs.pref (+6 lines)
47	on: Log	47	on: Log
48	off: "Don't log"	48	off: "Don't log"
49	- when serials are added, deleted or changed.	49	- when serials are added, deleted or changed.
		50	-
		51	- pref: ReportsLog
		52	choices:
		53	on: Log
		54	off: "Don't log"
		55	- when reports are added, deleted or changed.

Lines 25-30 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt (-1 / +2 lines)
25	[% CASE 'LETTER' %]Letter	25	[% CASE 'LETTER' %]Letter
26	[% CASE 'FINES' %]Fines	26	[% CASE 'FINES' %]Fines
27	[% CASE 'SYSTEMPREFERENCE' %]System prefs	27	[% CASE 'SYSTEMPREFERENCE' %]System prefs
		28	[% CASE 'REPORTS' %]Reports
28	[% CASE %][% module %]	29	[% CASE %][% module %]
29	[% END %]	30	[% END %]
30	[% END %]	31	[% END %]
Lines 75-81 Link Here
75	[% ELSE %]	76	[% ELSE %]
76	<option value="">All</option>	77	<option value="">All</option>
77	[% END %]	78	[% END %]
78	[% FOREACH modx IN [ 'CATALOGUING' 'AUTHORITIES' 'MEMBERS' 'ACQUISITIONS' 'SERIAL' 'CIRCULATION' 'LETTER' 'FINES' 'SYSTEMPREFERENCE' ] %]	79	[% FOREACH modx IN [ 'CATALOGUING' 'AUTHORITIES' 'MEMBERS' 'ACQUISITIONS' 'SERIAL' 'CIRCULATION' 'LETTER' 'FINES' 'SYSTEMPREFERENCE' 'REPORTS' ] %]
79	[% IF modules.grep(modx).size %]	80	[% IF modules.grep(modx).size %]
80	<option value="[% modx %]" selected="selected">[% PROCESS translate_log_module module=modx %]</option>	81	<option value="[% modx %]" selected="selected">[% PROCESS translate_log_module module=modx %]</option>
81	[% ELSE %]	82	[% ELSE %]

Lines 31-36 use C4::Dates qw/format_date/; Link Here

(-)a/reports/guided_reports.pl (-1 / +4 lines)
31	use C4::Debug;	31	use C4::Debug;
32	use C4::Branch; # XXX subfield_is_koha_internal_p	32	use C4::Branch; # XXX subfield_is_koha_internal_p
33	use C4::Koha qw/IsAuthorisedValueCategory GetFrameworksLoop/;	33	use C4::Koha qw/IsAuthorisedValueCategory GetFrameworksLoop/;
		34	use C4::Context;
		35	use C4::Log;
34		36
35	=head1 NAME	37	=head1 NAME
36		38
Lines 237-242 elsif ( $phase eq 'Update SQL'){ Link Here
237	'reportname' => $reportname,	239	'reportname' => $reportname,
238	'id' => $id,	240	'id' => $id,
239	);	241	);
		242	logaction( "REPORTS", "MODIFY", $id, "$name \| $sql" ) if C4::Context->preference("ReportsLog");
240	}	243	}
241	if ( $usecache ) {	244	if ( $usecache ) {
242	$template->param(	245	$template->param(
Lines 594-599 elsif ( $phase eq 'Save Report' ) { Link Here
594	cache_expiry => $cache_expiry,	597	cache_expiry => $cache_expiry,
595	public => $public,	598	public => $public,
596	} );	599	} );
		600	logaction( "REPORTS", "ADD", $id, "$name \| $sql" ) if C4::Context->preference("ReportsLog");
597	$template->param(	601	$template->param(
598	'save_successful' => 1,	602	'save_successful' => 1,
599	'reportname' => $name,	603	'reportname' => $name,
600	-

Return to bug 14024