[Koha-cvs] CVS: koha/circ branchtransfers.pl,1.3.2.3,1.3.2.4 circulation.pl,1.23.2.6,1.23.2.7 returns.pl,1.13.2.4,1.13.2.5 selectbranchprinter.pl,1.3.2.1,1.3.2.2

[Steve Tonnesen]

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv31168/circ

Modified Files:
      Tag: rel-1-2
	branchtransfers.pl circulation.pl returns.pl 
	selectbranchprinter.pl 
Log Message:
Fixed seriestitle bug in detail templates.
Fixed bug in circulation module when there was only one branch/printer or when
the cookie was set to a non-existent branch/printer


Index: branchtransfers.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/branchtransfers.pl,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -C2 -r1.3.2.3 -r1.3.2.4
*** branchtransfers.pl	9 Sep 2002 17:41:49 -0000	1.3.2.3
--- branchtransfers.pl	23 Oct 2002 20:27:51 -0000	1.3.2.4
***************
*** 58,61 ****
--- 58,64 ----
  ($printer) || ($printer=$query->cookie('printer')) ;
  
+ ($branches->{$branch}) || ($branch=(keys %$branches)[0]);
+ ($printers->{$printer}) || ($printer=(keys %$printers)[0]);
+ 
  my $request=$query->param('request');
  

Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.23.2.6
retrieving revision 1.23.2.7
diff -C2 -r1.23.2.6 -r1.23.2.7
*** circulation.pl	9 Sep 2002 17:41:49 -0000	1.23.2.6
--- circulation.pl	23 Oct 2002 20:27:51 -0000	1.23.2.7
***************
*** 54,57 ****
--- 54,62 ----
  ($printer) || ($printer=$query->cookie('printer')) ;
  
+ ($branches->{$branch}) || ($branch=(keys %$branches)[0]);
+ ($printers->{$printer}) || ($printer=(keys %$printers)[0]);
+ 
+ 
+ 
  #set up cookie.....
  my $info = '';

Index: returns.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/returns.pl,v
retrieving revision 1.13.2.4
retrieving revision 1.13.2.5
diff -C2 -r1.13.2.4 -r1.13.2.5
*** returns.pl	9 Sep 2002 17:41:49 -0000	1.13.2.4
--- returns.pl	23 Oct 2002 20:27:52 -0000	1.13.2.5
***************
*** 50,53 ****
--- 50,56 ----
  ($printer) || ($printer=$query->cookie('printer')) ;
  
+ ($branches->{$branch}) || ($branch=(keys %$branches)[0]);
+ ($printers->{$printer}) || ($printer=(keys %$printers)[0]);
+ 
  
  #

Index: selectbranchprinter.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/selectbranchprinter.pl,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -r1.3.2.1 -r1.3.2.2
*** selectbranchprinter.pl	15 Aug 2002 00:46:26 -0000	1.3.2.1
--- selectbranchprinter.pl	23 Oct 2002 20:27:52 -0000	1.3.2.2
***************
*** 50,53 ****
--- 50,57 ----
  ($printer) || ($printer=$query->cookie('printer'));
  
+ ($branches->{$branch}) || ($branch=(keys %$branches)[0]);
+ ($printers->{$printer}) || ($printer=(keys %$printers)[0]);
+ 
+ 
  # is you force a selection....
  my $oldbranch = $branch;
***************
*** 100,103 ****
--- 104,108 ----
  } else {
      my ($printer) = keys %$printers;
+     $printerform.="Printer: ".$printers->{$printer}->{printername};
  } 
  
***************
*** 108,111 ****
--- 113,117 ----
  } else {
      my ($branch) = keys %$branches;
+     $branchform.= "Branch: ".$branches->{$branch}->{branchname};
  }