[Koha-patches] [PATCH] (bug #3802) fix branch deletion checks
Nahuel ANGELINETTI
nahuel.angelinetti at biblibre.com
Mon Nov 23 10:20:44 CET 2009
This fix checks that are done when a branch is deleted, and the message shown.
Now it check for borrowers and items attached to the deleted branch.
---
admin/branches.pl | 11 +++++++----
.../prog/en/modules/admin/branches.tmpl | 2 +-
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/admin/branches.pl b/admin/branches.pl
index 8150a1d..744ccfb 100755
--- a/admin/branches.pl
+++ b/admin/branches.pl
@@ -114,10 +114,13 @@ elsif ( $op eq 'delete' ) {
# check to see if the branchcode is being used in the database somewhere....
my $dbh = C4::Context->dbh;
- my $sth = $dbh->prepare("select count(*) from items where holdingbranch=? or homebranch=?");
- $sth->execute( $branchcode, $branchcode );
- my ($total) = $sth->fetchrow_array;
- if ($total) {
+ my $sthitems = $dbh->prepare("select count(*) from items where holdingbranch=? or homebranch=?");
+ my $sthborrowers = $dbh->prepare("select count(*) from borrowers where branchcode=?");
+ $sthitems->execute( $branchcode, $branchcode );
+ $sthborrowers->execute( $branchcode );
+ my ($totalitems) = $sthitems->fetchrow_array;
+ my ($totalborrowers) = $sthitems->fetchrow_array;
+ if ($totalitems or $totalborrowers) {
$template->param( else => 1 );
default("MESSAGE7", $template);
}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
index b3ecf07..de96c18 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
@@ -156,7 +156,7 @@
<!-- TMPL_IF name="MESSAGE4" --><div class="dialog message">Library category added</div><!-- /TMPL_IF -->
<!-- TMPL_IF name="MESSAGE5" --><div class="dialog message">Library category modified</div><!-- /TMPL_IF -->
<!-- TMPL_IF name="MESSAGE6" --><div class="dialog message">Library category deleted</div><!-- /TMPL_IF -->
- <!-- TMPL_IF name="MESSAGE7" --><div class="dialog message">Library cannot be deleted because there are patrons using that library</div><!-- /TMPL_IF -->
+ <!-- TMPL_IF name="MESSAGE7" --><div class="dialog message">Library cannot be deleted because there are patrons or items using that library</div><!-- /TMPL_IF -->
<!-- TMPL_IF name="MESSAGE8" --><div class="dialog message">Category cannot be deleted because there are libraries using that category</div><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="branches" -->
--
1.6.3.3
More information about the Koha-patches
mailing list