Bug 8435: (follow-up) prevent t/00-load.t failing

[koha.git] / admin / branch_transfer_limits.pl

diff --git a/admin/branch_transfer_limits.pl b/admin/branch_transfer_limits.pl
index cef7537..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,10 +40,33 @@ 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 $branchname = GetBranchName($branchcode);
+
+# Getting the branches for user selection
+my $branches = GetBranches();
+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;
+}
+
 
 # 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';
 }
@@ -69,15 +93,14 @@ 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 ) {
-                       foreach my $fromBranch ( @branchcodes ) {
-                               my $isSet = $input->param( $code . "_" . $toBranch . "_" . $fromBranch );
-                               if ( $isSet ) {
-                                    CreateBranchTransferLimit( $toBranch, $fromBranch, $code );
-                               }
+                       my $isSet = not $input->param( $code . "_" . $toBranch);
+                       if ( $isSet ) {
+                           CreateBranchTransferLimit( $toBranch, $branchcode, $code );
                        }
                }
        }
@@ -100,23 +123,12 @@ foreach my $code ( @codes ) {
        $row_data{ code } = $code;
        $row_data{ to_branch_loop } = \@to_branch_loop;
        foreach my $toBranch ( @branchcodes ) {
-               my @from_branch_loop;
                my %row_data;
-               $row_data{ code } = $code;
-               $row_data{ toBranch } = $toBranch;
-               $row_data{ from_branch_loop } = \@from_branch_loop;
-               
-               foreach my $fromBranch ( @branchcodes ) {
-                       my %row_data;
-                        my $isChecked = ! IsBranchTransferAllowed( $toBranch, $fromBranch, $code );
-                       $row_data{ code } = $code;
-                       $row_data{ toBranch } = $toBranch;
-                       $row_data{ fromBranch } = $fromBranch;
-                        $row_data{ isChecked } = $isChecked;
-                       
-                       push( @from_branch_loop, \%row_data );
-               }
-               
+                my $isChecked = IsBranchTransferAllowed( $toBranch, $branchcode, $code );
+               $row_data{ code }         = $code;
+               $row_data{ toBranch }     = $toBranch;
+               $row_data{ isChecked }    = $isChecked; 
+               $row_data{ toBranchname } = GetBranchName($toBranch);   
                push( @to_branch_loop, \%row_data );
        }
 
@@ -127,7 +139,10 @@ foreach my $code ( @codes ) {
 $template->param(
                branchcount => $branchcount,
                codes_loop => \@codes_loop,
+               branch_loop => \@branch_loop,
                branchcode_loop => \@branchcode_loop,
+               branchcode => $branchcode,
+               branchname => $branchname,
                limit_phrase => $limit_phrase,
                );