[Koha-cvs] CVS: koha/admin aqbookfund.pl,1.2,1.3 currency.pl,1.2,1.3 itemtypes.pl,1.2,1.3 printers.pl,1.3,1.4 stopwords.pl,1.3,1.4

[Steve Tonnesen]

Update of /cvsroot/koha/koha/admin
In directory usw-pr-cvs1:/tmp/cvs-serv6248

Modified Files:
	aqbookfund.pl currency.pl itemtypes.pl printers.pl 
	stopwords.pl 
Log Message:
Merging bug fix from rel-1-2


Index: aqbookfund.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/aqbookfund.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** aqbookfund.pl	24 Jun 2002 18:40:56 -0000	1.2
--- aqbookfund.pl	2 Jul 2002 21:46:52 -0000	1.3
***************
*** 236,240 ****
  		$results->[$i]{'bookfundname'},$results->[$i]{'bookfundgroup'},
  		mklink("$script_name?op=add_form&bookfundid=".$results->[$i]{'bookfundid'},'Edit'),
! 		mklink("$script_name?op=delete_confirm&bookfundid=".$results->[$i]{'bookfundid'},'Delete',''));
  	}
  	print mktableft;
--- 236,240 ----
  		$results->[$i]{'bookfundname'},$results->[$i]{'bookfundgroup'},
  		mklink("$script_name?op=add_form&bookfundid=".$results->[$i]{'bookfundid'},'Edit'),
! 		mklink("$script_name?op=delete_confirm&bookfundid=".$results->[$i]{'bookfundid'},'Delete'));
  	}
  	print mktableft;

Index: currency.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/currency.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** currency.pl	24 Jun 2002 18:40:56 -0000	1.2
--- currency.pl	2 Jul 2002 21:46:53 -0000	1.3
***************
*** 234,238 ****
  		print mktablerow(4,$toggle,$results->[$i]{'currency'},$results->[$i]{'rate'},
  		mklink("$script_name?op=add_form&searchfield=".$results->[$i]{'currency'},'Edit'),
! 		mklink("$script_name?op=delete_confirm&searchfield=".$results->[$i]{'currency'},'Delete',''));
  	}
  	print mktableft;
--- 234,238 ----
  		print mktablerow(4,$toggle,$results->[$i]{'currency'},$results->[$i]{'rate'},
  		mklink("$script_name?op=add_form&searchfield=".$results->[$i]{'currency'},'Edit'),
! 		mklink("$script_name?op=delete_confirm&searchfield=".$results->[$i]{'currency'},'Delete'));
  	}
  	print mktableft;

Index: itemtypes.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/itemtypes.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** itemtypes.pl	24 Jun 2002 18:40:56 -0000	1.2
--- itemtypes.pl	2 Jul 2002 21:46:53 -0000	1.3
***************
*** 258,262 ****
  		$results->[$i]{'renewalsallowed'}==1?'Yes':'No',$results->[$i]{'rentalcharge'},
  		mklink("$script_name?op=add_form&itemtype=".$results->[$i]{'itemtype'},'Edit'),
! 		mklink("$script_name?op=delete_confirm&itemtype=".$results->[$i]{'itemtype'},'Delete',''));
  	}
  	print mktableft;
--- 258,262 ----
  		$results->[$i]{'renewalsallowed'}==1?'Yes':'No',$results->[$i]{'rentalcharge'},
  		mklink("$script_name?op=add_form&itemtype=".$results->[$i]{'itemtype'},'Edit'),
! 		mklink("$script_name?op=delete_confirm&itemtype=".$results->[$i]{'itemtype'},'Delete'));
  	}
  	print mktableft;

Index: printers.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/printers.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** printers.pl	25 Jun 2002 11:00:19 -0000	1.3
--- printers.pl	2 Jul 2002 21:46:53 -0000	1.4
***************
*** 225,229 ****
  		print mktablerow(5,$toggle,$results->[$i]{'printername'},$results->[$i]{'printqueue'},$results->[$i]{'printtype'},
  		mklink("$script_name?op=add_form&searchfield=".$results->[$i]{'printername'},'Edit'),
! 		mklink("$script_name?op=delete_confirm&searchfield=".$results->[$i]{'printername'},'Delete',''));
  	}
  	print mktableft;
--- 225,229 ----
  		print mktablerow(5,$toggle,$results->[$i]{'printername'},$results->[$i]{'printqueue'},$results->[$i]{'printtype'},
  		mklink("$script_name?op=add_form&searchfield=".$results->[$i]{'printername'},'Edit'),
! 		mklink("$script_name?op=delete_confirm&searchfield=".$results->[$i]{'printername'},'Delete'));
  	}
  	print mktableft;

Index: stopwords.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/stopwords.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** stopwords.pl	25 Jun 2002 10:58:07 -0000	1.3
--- stopwords.pl	2 Jul 2002 21:46:53 -0000	1.4
***************
*** 214,218 ****
  	  	}
  		print mktablerow(2,$toggle,$results->[$i]{'word'},
! 		mklink("$script_name?op=delete_confirm&searchfield=".$results->[$i]{'word'},'Delete',''));
  	}
  	print mktableft;
--- 214,218 ----
  	  	}
  		print mktablerow(2,$toggle,$results->[$i]{'word'},
! 		mklink("$script_name?op=delete_confirm&searchfield=".$results->[$i]{'word'},'Delete'));
  	}
  	print mktableft;