Another bug 5004 fix, this time for road types github/bug_5004 origin/new/bug_5004
authorOwen Leonard <oleonard@myacpl.org>
Mon, 15 Nov 2010 23:13:32 +0000 (18:13 -0500)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 18 Nov 2010 20:29:48 +0000 (09:29 +1300)
The road types interface didn't block deletion of road
types in use, but the script included the same queries
that cities.pl did, as if it intended to.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
admin/roadtype.pl

index 544d488..a756594 100755 (executable)
@@ -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'}),