From 3c11a1c2f370e1ac25f0effea64306ba1079a2ec Mon Sep 17 00:00:00 2001 From: Adrien Saurat Date: Thu, 9 Feb 2012 16:18:44 +0100 Subject: [PATCH] Bug 4969: allows deletion of booksellers With JS check before delete. --- acqui/supplier.pl | 6 +++++- .../prog/en/includes/acquisitions-toolbar.inc | 11 +++++++++++ 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/acqui/supplier.pl b/acqui/supplier.pl index 3faa560..a24db4a 100755 --- a/acqui/supplier.pl +++ b/acqui/supplier.pl @@ -117,7 +117,11 @@ if ( $op eq 'display' ) { contracts => $contracts, ); } elsif ( $op eq 'delete' ) { - DelBookseller($id); + # no further message needed for the user + # the DELETE button only appears in the template if basketcount == 0 + if ( $supplier->{'basketcount'} == 0 ) { + DelBookseller($id); + } print $query->redirect('/cgi-bin/koha/acqui/acqui-home.pl'); exit; } else { diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc index f81b303..7e0143c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc @@ -1,6 +1,13 @@