Bug 17600: Standardize our EXPORT_OK

[srvgit] / rotating_collections / transferCollection.pl

diff --git a/rotating_collections/transferCollection.pl b/rotating_collections/transferCollection.pl
index afc7cef..1d5dcf8 100755 (executable)
--- a/rotating_collections/transferCollection.pl
+++ b/rotating_collections/transferCollection.pl
@@ -18,15 +18,14 @@
 
 use Modern::Perl;
 
-use C4::Output;
-use C4::Auth;
+use C4::Output qw( output_html_with_http_headers );
+use C4::Auth qw( get_template_and_user );
 use C4::Context;
 use C4::RotatingCollections;
-use C4::Branch;
 
 use CGI qw ( -utf8 );
 
-my $query = new CGI;
+my $query = CGI->new;
 
 my $colId    = $query->param('colId');
 my $toBranch = $query->param('toBranch');
@@ -36,49 +35,38 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "rotating_collections/transferCollection.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { tools => 'rotating_collections' },
-        debug           => 1,
     }
 );
 
 ## Transfer collection
-my ( $success, $errorCode, $errorMessage );
+my ( $success, $messages );
 if ($toBranch) {
-    ( $success, $errorCode, $errorMessage ) =
+    ( $success, $messages ) =
       TransferCollection( $colId, $toBranch );
 
     if ($success) {
-        $template->param( transferSuccess => 1 );
+        $template->param(
+            transferSuccess => 1,
+            messages        => $messages
+        );
     }
     else {
         $template->param(
             transferFailure => 1,
-            errorCode       => $errorCode,
-            errorMessage    => $errorMessage
+            messages        => $messages
         );
     }
 }
 
-## Set up the toBranch select options
-my $branches = GetBranches();
-my @branchoptionloop;
-foreach my $br ( keys %$branches ) {
-    my %branch;
-    $branch{code} = $br;
-    $branch{name} = $branches->{$br}->{'branchname'};
-    push( @branchoptionloop, \%branch );
-}
-@branchoptionloop = sort {$a->{name} cmp $b->{name}} @branchoptionloop;
-
 ## Get data about collection
-my ( $colId, $colTitle, $colDesc, $colBranchcode ) = GetCollection($colId);
+my ( $colTitle, $colDesc, $colBranchcode );
+( $colId, $colTitle, $colDesc, $colBranchcode ) = GetCollection($colId);
 $template->param(
     colId            => $colId,
     colTitle         => $colTitle,
     colDesc          => $colDesc,
     colBranchcode    => $colBranchcode,
-    branchoptionloop => \@branchoptionloop
 );
 
 output_html_with_http_headers $query, $cookie, $template->output;