From 0333765bede2ac37c787fdb6a339e7d7195a15ac Mon Sep 17 00:00:00 2001 From: tipaul Date: Tue, 28 Jan 2003 13:04:08 +0000 Subject: [PATCH] bugfix for bugzilla #160 --- admin/aqbookfund.pl | 8 ++++---- admin/aqbudget.pl | 2 +- .../default/en/parameters/aqbookfund.tmpl | 12 ++++++++++-- .../default/en/parameters/aqbudget.tmpl | 9 ++++++++- 4 files changed, 23 insertions(+), 8 deletions(-) diff --git a/admin/aqbookfund.pl b/admin/aqbookfund.pl index 882e1cabcf..d64b4eb64e 100755 --- a/admin/aqbookfund.pl +++ b/admin/aqbookfund.pl @@ -51,14 +51,14 @@ sub StringSearch { $searchstring=~ s/\'/\\\'/g; my @data=split(' ',$searchstring); my $count=@data; - my $query="select bookfundid,bookfundname,bookfundgroup from aqbookfund where bookfundid and (bookfundid like \"$data[0]%\") order by bookfundid"; + my $query="select bookfundid,bookfundname,bookfundgroup from aqbookfund where (bookfundid like \"$data[0]%\") order by bookfundid"; my $sth=$dbh->prepare($query); $sth->execute; my @results; my $cnt=0; while (my $data=$sth->fetchrow_hashref){ - push(@results,$data); - $cnt ++; + push(@results,$data); + $cnt ++; } # $sth->execute; $sth->finish; @@ -193,7 +193,7 @@ if ($op eq 'add_form') { } else { $toggle="white"; } - while (@toggle and @bookfundid and @bookfundname and @bookfundgroup) { + while (@toggle and @bookfundid and @bookfundname and @bookfundgroup) { my %row_data; $row_data{toggle} = shift @toggle; $row_data{bookfundid} = shift @bookfundid; diff --git a/admin/aqbudget.pl b/admin/aqbudget.pl index 5759516721..57ff1a05ef 100755 --- a/admin/aqbudget.pl +++ b/admin/aqbudget.pl @@ -53,7 +53,7 @@ sub StringSearch { $searchstring=~ s/\'/\\\'/g; my @data=split(' ',$searchstring); my $count=@data; - my $query="Select bookfundid,startdate,enddate,budgetamount from aqbudget where bookfundid and (bookfundid like \"$data[0]%\") order by bookfundid"; + my $query="Select bookfundid,startdate,enddate,budgetamount from aqbudget where (bookfundid like \"$data[0]%\") order by bookfundid"; my $sth=$dbh->prepare($query); $sth->execute; my @results; diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl index 66e62be554..a191062976 100644 --- a/koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl @@ -9,12 +9,20 @@ bookfund admin
method=post>
-
You Searched for


+
You Searched for


-" + " + + + + + + + +
Book fundNameGroupBudget     
  ">Budget?op=add_form&bookfundid= ">Edit?op=delete_confirm&bookfundid=">Delete  
  ">Budget?op=add_form&bookfundid= ">Edit?op=delete_confirm&bookfundid=">Delete  

      


diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl index bb569d0949..00117aaf8f 100644 --- a/koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl @@ -14,7 +14,14 @@ - > + > + + + + + + +
Book fundStart dateEnd dateBudget amount  
()">Edit">Delete
()">Edit">Delete
      


-- 2.39.5