X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=admin%2Fbranch_transfer_limits.pl;h=681f85b6bd5db69e5e2d22845692576fa734b714;hb=8a118d01bf3e2415b02fd4a8a820203491a2af90;hp=2cee238e9ea053326a044d5f5c3143b7469840bb;hpb=9c72711a2c632fb679d6be215f9fdd6a3b96faa2;p=koha.git

diff --git a/admin/branch_transfer_limits.pl b/admin/branch_transfer_limits.pl
index 2cee238e9e..681f85b6bd 100755
--- a/admin/branch_transfer_limits.pl
+++ b/admin/branch_transfer_limits.pl
@@ -1,52 +1,56 @@
 #!/usr/bin/perl
 
 # Copyright 2000-2002 Katipo Communications
+# copyright 2010 BibLibre
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
-use strict;
-use warnings;
+use Modern::Perl;
 
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Auth;
 use C4::Context;
 use C4::Output;
 use C4::Koha;
-use C4::Branch; 
 use C4::Circulation qw{ IsBranchTransferAllowed DeleteBranchTransferLimits CreateBranchTransferLimit };
 
 my $input = new CGI;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "admin/branch_transfer_limits.tmpl",
+    = get_template_and_user({template_name => "admin/branch_transfer_limits.tt",
 			     query => $input,
 			     type => "intranet",
-			     flagsrequired => {borrowers => 1},
+                 flagsrequired => {parameters => 'parameters_remaining_permissions'},
 			     debug => 1,
 			     });
 
 my $dbh = C4::Context->dbh;
-
-# Set the template language for the correct limit type
-my $limit_phrase = 'Collection Code';
-my $limitType = C4::Context->preference("BranchTransferLimitsType");
-if ( $limitType eq 'itemtype' ) {
-	$limit_phrase = 'Item Type';
+my $branchcode;
+if((!defined($input->param('branchcode'))) & C4::Context::mybranch() ne '')
+{
+    $branchcode = C4::Context::mybranch();
+}
+else
+{
+	$branchcode = $input->param('branchcode');
 }
 
+# Set the template language for the correct limit type using $limitType
+my $limitType = C4::Context->preference("BranchTransferLimitsType") || "ccode";
+
 my @codes;
 my @branchcodes;
 
@@ -69,15 +73,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 );
 			}
 		}
 	}
@@ -90,6 +93,7 @@ foreach my $branchcode ( @branchcodes ) {
 	$row_data{ branchcode } = $branchcode;
 	push ( @branchcode_loop, \%row_data );
 }
+my $branchcount = scalar(@branchcode_loop);
 
 ## Build the default data
 my @codes_loop;
@@ -99,23 +103,11 @@ 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;	
 		push( @to_branch_loop, \%row_data );
 	}
 
@@ -124,9 +116,11 @@ foreach my $code ( @codes ) {
 
 
 $template->param(
+		branchcount => $branchcount,
 		codes_loop => \@codes_loop,
 		branchcode_loop => \@branchcode_loop,
-		limit_phrase => $limit_phrase,
+		branchcode => $branchcode,
+        limitType => $limitType,
 		);
 
 output_html_with_http_headers $input, $cookie, $template->output;