Jonathan Druart
714d73d7e1
We should not generate the report if the job hasn't started yet
Test plan:
Stop the koha-worker processes, modify a new item using the batch mod
tool, then see the detail page of the job
Without this patch an error is generated:
Can't use an undefined value as an ARRAY reference at /kohadevbox/koha/Koha/BackgroundJob/BatchUpdateItem.pm line 175
Signed-off-by: Andrew <andrewfh@dubcolib.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 931f4bd797)
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
97 lines
2.8 KiB
Perl
Executable file
97 lines
2.8 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 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 $jobs =
|
|
$can_manage_background_jobs
|
|
? Koha::BackgroundJobs->search( {},
|
|
{ order_by => { -desc => 'enqueued_on' } } )
|
|
: Koha::BackgroundJobs->search(
|
|
{ borrowernumber => $logged_in_user->borrowernumber },
|
|
{ order_by => { -desc => 'enqueued_on' } }
|
|
);
|
|
$template->param( jobs => $jobs );
|
|
}
|
|
|
|
$template->param(
|
|
messages => \@messages,
|
|
op => $op,
|
|
);
|
|
|
|
output_html_with_http_headers $input, $cookie, $template->output;
|