Jonathan Druart
ca36ee3794
When accessing the modification logs from a link that does not
explicitly set the to and from dates (e.g., from patron or bib details),
no results are displayed unless the object had an action occur during
the current day.
This is a side-effect of commit 5dceb851 for bug 13813.
Test plan:
- View the modification logs of a record which has already been modified
(/tools/viewlog.pl?do_it=1&modules=CATALOGUING&action=MODIFY&object=XXX)
=> Without this patch, you won't see any logs (unless you have modified
the record today)
=> With this patch, the behavior is the same as prior bug 13813 (you can
check in 3.20.x), you will see all logs
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
95 lines
3 KiB
Perl
95 lines
3 KiB
Perl
#!/usr/bin/perl
|
|
#
|
|
# Copyright 2011 MJ Ray and software.coop
|
|
# This Koha test module is a stub!
|
|
# Add more tests here!!!
|
|
|
|
use Modern::Perl;
|
|
use Test::More tests => 8;
|
|
|
|
use C4::Context;
|
|
use Koha::DateUtils;
|
|
|
|
use t::lib::Mocks qw/mock_preference/; # to mock CronjobLog
|
|
use Data::Dumper;
|
|
|
|
$| = 1;
|
|
|
|
BEGIN {
|
|
use_ok('C4::Log');
|
|
}
|
|
my $success;
|
|
|
|
eval {
|
|
# FIXME: are we sure there is an member number 1?
|
|
# FIXME: can we remove this log entry somehow?
|
|
logaction("MEMBERS","MODIFY",1,"test operation");
|
|
$success = 1;
|
|
} or do {
|
|
diag($@);
|
|
$success = 0;
|
|
};
|
|
ok($success, "logaction seemed to work");
|
|
|
|
eval {
|
|
# FIXME: US formatted date hardcoded into test for now
|
|
$success = scalar(@{GetLogs("","","",undef,undef,"","")});
|
|
} or do {
|
|
diag($@);
|
|
$success = 0;
|
|
};
|
|
ok($success, "GetLogs returns results for an open search");
|
|
|
|
eval {
|
|
# FIXME: US formatted date hardcoded into test for now
|
|
my $date = output_pref( { dt => dt_from_string, datenonly => 1, dateformat => 'iso' } );
|
|
$success = scalar(@{GetLogs( $date, $date, "", undef, undef, "", "") } );
|
|
} or do {
|
|
diag($@);
|
|
$success = 0;
|
|
};
|
|
ok($success, "GetLogs accepts dates in an All-matching search");
|
|
|
|
eval {
|
|
$success = scalar(@{GetLogs("","","",["MEMBERS"],["MODIFY"],1,"")});
|
|
} or do {
|
|
diag($@);
|
|
$success = 0;
|
|
};
|
|
ok($success, "GetLogs seemed to find ".$success." like our test record in a tighter search");
|
|
|
|
# Make sure we can rollback.
|
|
my $dbh = C4::Context->dbh;
|
|
$dbh->{AutoCommit} = 0;
|
|
$dbh->{RaiseError} = 1;
|
|
|
|
# We want numbers to be the same between runs.
|
|
$dbh->do("DELETE FROM action_logs;");
|
|
|
|
t::lib::Mocks::mock_preference('CronjobLog',0);
|
|
cronlogaction();
|
|
my $cronJobCount = $dbh->selectrow_array("SELECT COUNT(*) FROM action_logs WHERE module='CRONJOBS';",{});
|
|
is($cronJobCount,0,"Cronjob not logged as expected.");
|
|
|
|
t::lib::Mocks::mock_preference('CronjobLog',1);
|
|
cronlogaction();
|
|
$cronJobCount = $dbh->selectrow_array("SELECT COUNT(*) FROM action_logs WHERE module='CRONJOBS';",{});
|
|
is($cronJobCount,1,"Cronjob logged as expected.");
|
|
|
|
subtest "GetLogs should return all logs if dates are not set" => sub {
|
|
plan tests => 2;
|
|
my $today = dt_from_string->add(minutes => -1);
|
|
my $yesterday = dt_from_string->add( days => -1 );
|
|
$dbh->do(q|
|
|
INSERT INTO action_logs (timestamp, user, module, action, object, info)
|
|
VALUES
|
|
(?, 42, 'CATALOGUING', 'MODIFY', 4242, 'Record 42 has been modified by patron 4242 yesterday'),
|
|
(?, 43, 'CATALOGUING', 'MODIFY', 4242, 'Record 43 has been modified by patron 4242 today')
|
|
|, undef, output_pref({dt =>$yesterday, dateformat => 'iso'}), output_pref({dt => $today, dateformat => 'iso'}));
|
|
my $logs = GetLogs( undef, undef, undef, ['CATALOGUING'], ['MODIFY'], 4242 );
|
|
is( scalar(@$logs), 2, 'GetLogs should return all logs regardless the dates' );
|
|
$logs = GetLogs( output_pref($today), undef, undef, ['CATALOGUING'], ['MODIFY'], 4242 );
|
|
is( scalar(@$logs), 1, 'GetLogs should return the logs for today' );
|
|
};
|
|
|
|
$dbh->rollback();
|