Bug 8215 - Course Reserves

[koha.git] / admin / branch_transfer_limits.pl

diff --git a/admin/branch_transfer_limits.pl b/admin/branch_transfer_limits.pl
index 1b89efb..e7422a6 100755 (executable)
--- a/admin/branch_transfer_limits.pl
+++ b/admin/branch_transfer_limits.pl
@@ -1,6 +1,7 @@
 #!/usr/bin/perl
 
 # Copyright 2000-2002 Katipo Communications
+# copyright 2010 BibLibre
 #
 # This file is part of Koha.
 #
@@ -39,8 +40,16 @@ my ($template, $loggedinuser, $cookie)
                             });
 
 my $dbh = C4::Context->dbh;
+my $branchcode;
+if((!defined($input->param('branchcode'))) & mybranch() ne '')
+{
+       $branchcode = mybranch();
+}
+else
+{
+       $branchcode = $input->param('branchcode');
+}
 
-my $branchcode = $input->param('branchcode');
 my $branchname = GetBranchName($branchcode);
 
 # Getting the branches for user selection
@@ -49,6 +58,7 @@ my @branch_loop;
 for my $thisbranch (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %$branches) {
     my %row =(value => $thisbranch,
               branchname => $branches->{$thisbranch}->{'branchname'},
+              selected => $thisbranch eq $branchcode ? 1 : 0,
              );
     push @branch_loop, \%row;
 }
@@ -56,7 +66,7 @@ for my $thisbranch (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{b
 
 # Set the template language for the correct limit type
 my $limit_phrase = 'Collection Code';
-my $limitType = C4::Context->preference("BranchTransferLimitsType");
+my $limitType = C4::Context->preference("BranchTransferLimitsType") || "ccode";
 if ( $limitType eq 'itemtype' ) {
        $limit_phrase = 'Item Type';
 }
@@ -83,7 +93,8 @@ while ( my $row = $sth->fetchrow_hashref ) {
 
 ## If Form Data Passed, Update the Database
 if ( $input->param('updateLimits') ) {
-       DeleteBranchTransferLimits();
+    DeleteBranchTransferLimits($branchcode);
+
 
        foreach my $code ( @codes ) {
                foreach my $toBranch ( @branchcodes ) {