X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=admin%2Fbranch_transfer_limits.pl;h=681f85b6bd5db69e5e2d22845692576fa734b714;hb=3fb069f8eca1674a10cb2e502ea76ae9d4a90e2d;hp=8c6f42e419c2985def3435d468517b5373ae52f1;hpb=5e94de956610072d3d37bbbde1c8d48920414118;p=koha.git

diff --git a/admin/branch_transfer_limits.pl b/admin/branch_transfer_limits.pl
index 8c6f42e419..681f85b6bd 100755
--- a/admin/branch_transfer_limits.pl
+++ b/admin/branch_transfer_limits.pl
@@ -5,71 +5,51 @@
 #
 # 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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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;
 my $branchcode;
-if((!defined($input->param('branchcode'))) & mybranch() ne '')
+if((!defined($input->param('branchcode'))) & C4::Context::mybranch() ne '')
 {
-	$branchcode = mybranch();
+    $branchcode = C4::Context::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';
+# Set the template language for the correct limit type using $limitType
 my $limitType = C4::Context->preference("BranchTransferLimitsType") || "ccode";
-if ( $limitType eq 'itemtype' ) {
-	$limit_phrase = 'Item Type';
-}
 
 my @codes;
 my @branchcodes;
@@ -93,7 +73,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 ) {
@@ -127,7 +108,6 @@ foreach my $code ( @codes ) {
 		$row_data{ code }         = $code;
 		$row_data{ toBranch }     = $toBranch;
 		$row_data{ isChecked }    = $isChecked;	
-		$row_data{ toBranchname } = GetBranchName($toBranch);	
 		push( @to_branch_loop, \%row_data );
 	}
 
@@ -138,11 +118,9 @@ 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,
+        limitType => $limitType,
 		);
 
 output_html_with_http_headers $input, $cookie, $template->output;