gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote branch 'kc/new/bug_5004' into kcmaster

This commit is contained in:
Chris Cormack 2010-11-19 09:53:19 +13:00
parent 40bb99763d 14b66041f0
commit 0874050dc6
3 changed files with 2 additions and 25 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'},
);

8
admin/roadtype.pl
View File

@ -98,18 +98,10 @@ if ($op eq 'add_form') {
} elsif ($op eq 'delete_confirm') {
$template->param(delete_confirm => 1);
my $dbh = C4::Context->dbh;
my $sth=$dbh->prepare("select count(*) as total from borrowers,roadtype where borrowers.streettype=roadtype.road_type and roadtypeid=?");
$sth->execute($roadtypeid);
my $total = $sth->fetchrow_hashref;
$sth->finish;
$template->param(total => $total->{'total'});
my $sth2=$dbh->prepare("select roadtypeid,road_type from roadtype where roadtypeid=?");
$sth2->execute($roadtypeid);
my $data=$sth2->fetchrow_hashref;
$sth2->finish;
if ($total->{'total'} >0) {
$template->param(totalgtzero => 1);
}
$template->param(
road_type => ( $data->{'road_type'}),

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 -->