From 717d4ade5c1ea18981cf3accfb37eb0cfaf3aab5 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 16 Aug 2010 15:27:32 -0400 Subject: [PATCH] Fix for Bug 5004, Don't block deletion of cities when instances exist in borrowers table --- admin/cities.pl | 9 ++------- .../prog/en/modules/admin/cities.tmpl | 10 ---------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/admin/cities.pl b/admin/cities.pl index 3e33a71..58e33ae 100755 --- a/admin/cities.pl +++ b/admin/cities.pl @@ -86,15 +86,10 @@ if ($op eq 'add_form') { # called by default form, used to confirm deletion of data in DB } elsif ($op eq 'delete_confirm') { $template->param(delete_confirm => 1); - my $sth=$dbh->prepare("select count(*) as total from borrowers,cities where borrowers.city=cities.city_name and cityid=?"); - # FIXME: this check used to pretend there was a FK "select_city" in borrowers. + my $sth=$dbh->prepare("select cityid,city_name,city_zipcode from cities where cityid=?"); $sth->execute($cityid); - my $total = $sth->fetchrow_hashref; - my $sth2=$dbh->prepare("select cityid,city_name,city_zipcode from cities where cityid=?"); - $sth2->execute($cityid); - my $data=$sth2->fetchrow_hashref; + my $data=$sth->fetchrow_hashref; $template->param( - total => $total->{'total'}, city_name => $data->{'city_name'}, city_zipcode => $data->{'city_zipcode'}, ); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl index 62055da..203d19b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl @@ -69,14 +69,8 @@ - -
-

Cannot Delete City ""

-

This record is used times. Impossible to delete it

-

Delete City "?"

- @@ -89,16 +83,12 @@
City id
" method="post"> - - - " />
" method="get"> -
-- 1.7.0.4