fix for #387

liblime · May 15, 2003 · e862f50 · e862f50
1 parent 43bbd43
commit e862f50
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 38 deletions.
diff --git a/koha-tmpl/intranet-tmpl/default/en/request.tmpl b/koha-tmpl/intranet-tmpl/default/en/request.tmpl
@@ -128,11 +128,9 @@
 				<TMPL_ELSE>
 					<select name=pickup>
 						<TMPL_LOOP Name="branchloop">
-							<option value=<TMPL_VAR Name="branch">
-								<TMPL_IF Name="selected">
-									selected
-								</TMPL_IF>
-							><TMPL_VAR Name="branchname"></option>
+							<option value="<TMPL_VAR Name="branch">"<TMPL_IF Name="selected"> selected</TMPL_IF>>
+								<TMPL_VAR Name="branchname">
+							</option>
 						</TMPL_LOOP>
 					</select>
 				</TMPL_IF>
@@ -147,7 +145,7 @@
 						Next Available
 					<TMPL_ELSE>
 						<TMPL_IF Name="constrainttypeo">
-							This type only <TMPL_VAR Name="volumeddesc"> <TMPL_VAR Name="itemtype">
+							This type only : <TMPL_VAR Name="volumeddesc"> <TMPL_VAR Name="itemtype">
 						</TMPL_IF>
 					</TMPL_IF>
 				</TMPL_IF>

diff --git a/modrequest.pl b/modrequest.pl
@@ -44,7 +44,6 @@
 # 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
@@ -63,25 +63,6 @@
 	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 @@
 
 #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 @@
 		$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;