Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Fix for Bug 5004, Don't block deletion of cities when instances exist in borrowers table

Browse source 
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
This commit is contained in:
Owen Leonard 2010-11-15 08:09:11 -05:00 committed by Chris Cormack
parent 3c756153d2
commit a36a7e1e61
2 changed files with 2 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
admin/cities.pl
View file

@ -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'},
);

10
koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl
View file

@ -69,14 +69,8 @@
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="delete_confirm" -->
<!-- TMPL_IF NAME="total" -->
<div class="dialog message">
<h3>Cannot Delete City "<!-- TMPL_VAR NAME="city_name" -->"</h3>
<p>This record is used <!-- TMPL_VAR NAME="total" --> times. Impossible to delete it</p>
<!-- TMPL_ELSE -->
<div class="dialog alert">
<h3>Delete City "<!-- TMPL_VAR NAME="city_name" -->?"</h3>
<!-- /TMPL_IF -->
<table>
<tr><th>City id</th>
<td><!-- TMPL_VAR NAME="cityid" --></td>
@ -89,16 +83,12 @@
</tr>
</table>
<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
<!-- TMPL_IF NAME="total" -->
<input type="submit" class="approv" value="OK" />
<!-- TMPL_ELSE -->
<input type="hidden" name="op" value="delete_confirmed" />
<input type="hidden" name="cityid" value="<!-- TMPL_VAR NAME="cityid" -->" />
<input type="submit" class="approve" value="Yes, Delete" />
</form>
<form action="<!-- TMPL_VAR NAME="script_name" -->" method="get">
<input type="submit" class="deny" value="No, do not Delete" />
<!-- /TMPL_IF -->
</form>
</div>
<!-- /TMPL_IF -->