From e862f505e0700ce0048404351b1f30832a5be54c Mon Sep 17 00:00:00 2001 From: tipaul Date: Thu, 15 May 2003 13:56:52 +0000 Subject: [PATCH] fix for #387 --- .../intranet-tmpl/default/en/request.tmpl | 10 ++--- modrequest.pl | 1 - request.pl | 43 ++++++------------- 3 files changed, 16 insertions(+), 38 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/default/en/request.tmpl b/koha-tmpl/intranet-tmpl/default/en/request.tmpl index 923a091713..5629fda1d4 100644 --- a/koha-tmpl/intranet-tmpl/default/en/request.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/request.tmpl @@ -128,11 +128,9 @@ @@ -147,7 +145,7 @@ Next Available - This type only + This type only : diff --git a/modrequest.pl b/modrequest.pl index 7ca207de1f..554105c1f0 100755 --- a/modrequest.pl +++ b/modrequest.pl @@ -44,7 +44,6 @@ my $count=@rank; # no attempt is made to check consistency. for (my $i=0;$i<$count;$i++){ UpdateReserve($rank[$i],$biblio[$i],$borrower[$i],$branch[$i]); #from C4::Reserves2 - print "updating reserve"; } my $from=$input->param('from'); diff --git a/request.pl b/request.pl index 5f71e084ca..dd49478012 100755 --- a/request.pl +++ b/request.pl @@ -63,25 +63,6 @@ for (my $i=1; $i<=$num; $i++){ push(@optionloop, \%option); } - -# get branch information -my $branch = $input->cookie('branch'); -($branch) || ($branch = 'L'); -my $branches = getbranches(); -# make branch selection options... -my @branchloop; -foreach my $br (keys %$branches) { -# (next) unless $branches->{$br}->{'IS'}; -# # Only branches with the 'IS' branchrelation -# # can issue books - my %abranch; - $abranch{'selected'}=($br eq $branch); - $abranch{'branch'}=$br; - $abranch{'branchname'}=$branches->{$br}->{'branchname'}; - push(@branchloop,\%abranch); -} - - # todays date my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) =localtime(time); $year=$year+1900; @@ -124,6 +105,7 @@ foreach my $dat (sort {$b->{'dateaccessioned'} cmp $a->{'dateaccessioned'}} @dat #existingreserves building my @reserveloop; +my $branches = getbranches(); foreach my $res (sort {$a->{'found'} cmp $b->{'found'}} @$reserves){ my %reserve; # my $prioropt = priorityoptions($totalcount, $res->{'priority'}); @@ -134,18 +116,17 @@ foreach my $res (sort {$a->{'found'} cmp $b->{'found'}} @$reserves){ $option{selected}=($i==$res->{'priority'}); push(@optionloop, \%option); } -# my $bropt = branchoptions($res->{'branchcode'}); -# my @branchloop; -# foreach my $br (keys %$branches) { -# (next) unless $branches->{$br}->{'IS'}; -# # Only branches with the 'IS' branchrelation -# # can issue books -# my %abranch; -# $abranch{'selected'}=($br eq $res->{'branchcode'}); -# $abranch{'branch'}=$br; -# $abranch{'branchname'}=$branches->{$br}->{'branchname'}; -# push(@branchloop,\%abranch); -# } + my @branchloop; + foreach my $br (keys %$branches) { +# (next) unless $branches->{$br}->{'IS'}; + # Only branches with the 'IS' branchrelation + # can issue books + my %abranch; + $abranch{'selected'}=($br eq $res->{'branchcode'}); + $abranch{'branch'}=$br; + $abranch{'branchname'}=$branches->{$br}->{'branchname'}; + push(@branchloop,\%abranch); + } if ($res->{'found'} eq 'W') { my %env; -- 2.39.5