[Koha-cvs] CVS: koha/circ branchtransfers.pl,1.13,1.14 circulation.pl,1.45,1.46 selectbranchprinter.pl,1.5,1.6

[Steve Tonnesen]

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

Modified Files:
        branchtransfers.pl circulation.pl selectbranchprinter.pl 
Log Message:
Merging changes from rel-1-2 into trunk (circulation module only)


Index: branchtransfers.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/branchtransfers.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** branchtransfers.pl  9 Oct 2002 14:28:51 -0000       1.13
--- branchtransfers.pl  24 Oct 2002 18:30:18 -0000      1.14
***************
*** 27,30 ****
--- 27,31 ----
  use C4::Output;
  use C4::Reserves2;
+ use C4::Auth;
  
  ###############################################
***************
*** 47,50 ****
--- 48,52 ----
  
  my $query=new CGI;
+ my ($loggedinuser, $sessioncookie, $sessionID) = checkauth($query);
  
  
***************
*** 56,59 ****
--- 58,64 ----
  ($printer) || ($printer=$query->cookie('printer')) ;
  
+ ($branches->{$branch}) || ($branch=(keys %$branches)[0]);
+ ($printers->{$printer}) || ($printer=(keys %$printers)[0]);
+ 
  my $request=$query->param('request');
  
***************
*** 65,72 ****
  my $tobranchoptions;
  foreach my $br (keys %$branches) {
! # FIXME - Dunno what this line was supposed to do, but "CU" never
! # appears anywhere else, so this was preventing this code from
! # working, by creating an empty <select> block later on.
! #    (next) unless $branches->{$br}->{'CU'};
      my $selected='';
      ($selected='selected') if ($br eq $tobranchcd);
--- 70,74 ----
  my $tobranchoptions;
  foreach my $br (keys %$branches) {
!     (next) unless $branches->{$br}->{'CU'};
      my $selected='';
      ($selected='selected') if ($br eq $tobranchcd);
***************
*** 297,301 ****
  # Make the page .....
  
! print $query->header;
  print startpage;
  #print startmenu('circulation');
--- 299,303 ----
  # Make the page .....
  
! print $query->header(-cookie=>$sessioncookie);
  print startpage;
  #print startmenu('circulation');

Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -r1.45 -r1.46
*** circulation.pl      13 Oct 2002 10:43:54 -0000      1.45
--- circulation.pl      24 Oct 2002 18:30:18 -0000      1.46
***************
*** 28,31 ****
--- 28,37 ----
  use C4::Output;
  use C4::Print;
+ use DBI;
+ use C4::Auth;
+ 
+ my $query=new CGI;
+ my ($loggedinuser, $sessioncookie, $sessionID) = checkauth($query);
+ 
  
  my %env;
***************
*** 48,51 ****
--- 54,62 ----
  ($printer) || ($printer=$query->cookie('printer')) ;
  
+ ($branches->{$branch}) || ($branch=(keys %$branches)[0]);
+ ($printers->{$printer}) || ($printer=(keys %$printers)[0]);
+ 
+ 
+ 
  #set up cookie.....
  my $info = '';
***************
*** 481,487 ****
  
  if ($branchcookie && $printercookie) {
!     print $query->header(-type=>'text/html',-expires=>'now', 
-cookie=>[$branchcookie,$printercookie]);
  } else {
!     print $query->header();
  }
  
--- 492,498 ----
  
  if ($branchcookie && $printercookie) {
!     print $query->header(-type=>'text/html',-expires=>'now', 
-cookie=>[$branchcookie,$printercookie,$sessioncookie]);
  } else {
!     print $query->header(-cookie=>[$sessioncookie]);
  }
  

Index: selectbranchprinter.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/selectbranchprinter.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** selectbranchprinter.pl      13 Oct 2002 10:44:17 -0000      1.5
--- selectbranchprinter.pl      24 Oct 2002 18:30:18 -0000      1.6
***************
*** 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;
***************
*** 69,79 ****
  foreach (keys %$branches) {
      (next) unless ($_);
!     # FIXME - What is this "IS" field? I suspect it's a leftover from
!     # some previous iteration of the code, and means "this is a branch
!     # that does issues". But it never gets set, so no branches ever
!     # get selected, and the user can't choose a branch.
!     # FIXME - Also, shouldn't librarians be able to select any branch,
!     # not just ones that handle issues?
! #    (next) unless ($branches->{$_}->{'IS'});
      $branchcount++;
      my $selected='';
--- 73,77 ----
  foreach (keys %$branches) {
      (next) unless ($_);
!     (next) unless ($branches->{$_}->{'IS'});
      $branchcount++;
      my $selected='';
***************
*** 106,110 ****
  } else {
      my ($printer) = keys %$printers;
! }
  
  if ($branchcount>1) {
--- 104,109 ----
  } else {
      my ($printer) = keys %$printers;
!     $printerform.="Printer: ".$printers->{$printer}->{printername};
! } 
  
  if ($branchcount>1) {
***************
*** 114,118 ****
  } else {
      my ($branch) = keys %$branches;
! }
  
  
--- 113,118 ----
  } else {
      my ($branch) = keys %$branches;
!     $branchform.= "Branch: ".$branches->{$branch}->{branchname};
! }