Koha/admin/background_jobs.pl
Jonathan Druart e9ac367a05
Bug 30462: Fix display of the complete jobs
We want to display the jobs terminated in the last hour, not today.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
2022-09-08 10:38:34 -07:00

118 lines
3.5 KiB
Perl
Executable file

#! /usr/bin/perl
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# Koha is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Koha; if not, see <http://www.gnu.org/licenses>.
use Modern::Perl;
use CGI qw ( -utf8 );
use C4::Context;
use Koha::DateUtils qw( dt_from_string );
use C4::Auth qw( get_template_and_user );
use C4::Output qw( output_html_with_http_headers );
use Koha::BackgroundJobs;
use Koha::Virtualshelves;
my $input = CGI->new;
my $op = $input->param('op') || 'list';
my @messages;
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
{
template_name => "admin/background_jobs.tt",
query => $input,
type => "intranet",
flagsrequired => { catalogue => 1 },
}
);
my $logged_in_user = Koha::Patrons->find($loggedinuser);
my $can_manage_background_jobs =
$logged_in_user->has_permission( { parameters => 'manage_background_jobs' } );
if ( $op eq 'view' ) {
my $id = $input->param('id');
if ( my $job = Koha::BackgroundJobs->find($id) ) {
if ( $job->borrowernumber ne $loggedinuser
&& !$can_manage_background_jobs )
{
push @messages, { code => 'cannot_view_job' };
}
else {
$template->param( job => $job, );
if ( $job->status ne 'new' ) {
my $report = $job->additional_report() || {};
$template->param( %$report );
}
}
} else {
$op = 'list';
}
}
if ( $op eq 'cancel' ) {
my $id = $input->param('id');
my $job = Koha::BackgroundJobs->find($id);
if ( $can_manage_background_jobs
|| $job->borrowernumber eq $logged_in_user->borrowernumber )
{
$job->cancel;
}
else {
push @messages, { code => 'cannot_cancel_job' };
}
$op = 'list';
}
if ( $op eq 'list' ) {
my $queued_jobs =
$can_manage_background_jobs
? Koha::BackgroundJobs->search( { ended_on => undef },
{ order_by => { -desc => 'enqueued_on' } } )
: Koha::BackgroundJobs->search(
{ borrowernumber => $logged_in_user->borrowernumber, ended_on => undef },
{ order_by => { -desc => 'enqueued_on' } }
);
$template->param( queued => $queued_jobs );
my $ended_since = dt_from_string->subtract( minutes => '60' );
my $dtf = Koha::Database->new->schema->storage->datetime_parser;
my $complete_jobs =
$can_manage_background_jobs
? Koha::BackgroundJobs->search(
{
ended_on => { '>=' => $dtf->format_datetime($ended_since) }
},
{ order_by => { -desc => 'enqueued_on' } }
)
: Koha::BackgroundJobs->search(
{
borrowernumber => $logged_in_user->borrowernumber,
ended_on => { '>=' => $dtf->format_datetime($ended_since) }
},
{ order_by => { -desc => 'enqueued_on' } }
);
$template->param( complete => $complete_jobs );
}
$template->param(
messages => \@messages,
op => $op,
);
output_html_with_http_headers $input, $cookie, $template->output;