Bug 14366: Units doesn't get saved usefully for patroncards

[koha.git] / patroncards / edit-batch.pl

diff --git a/patroncards/edit-batch.pl b/patroncards/edit-batch.pl
index 9c3a57d..9cd9adb 100755 (executable)
--- a/patroncards/edit-batch.pl
+++ b/patroncards/edit-batch.pl
@@ -5,36 +5,35 @@
 #
 # 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 vars qw($debug);
 
-use CGI;
+use CGI qw ( -utf8 );
 use autouse 'Data::Dumper' => qw(Dumper);
 
 use C4::Auth qw(get_template_and_user);
 use C4::Output qw(output_html_with_http_headers);
-use C4::Branch qw(get_branch_code_from_name);
-use C4::Creators::Lib 1.000000 qw(get_card_summary html_table);
-use C4::Patroncards::Batch 1.000000;
+use C4::Creators;
+use C4::Patroncards;
 
 my $cgi = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "patroncards/edit-batch.tmpl",
+        template_name   => "patroncards/edit-batch.tt",
         query           => $cgi,
         type            => "intranet",
         authnotrequired => 0,
@@ -60,7 +59,7 @@ my @item_numbers = $cgi->param('item_number') if $cgi->param('item_number');
 my @borrower_numbers = $cgi->param('borrower_number') if $cgi->param('borrower_number');
 my $errstr = $cgi->param('error') || '';
 
-my $branch_code = get_branch_code_from_name($template->param('LoginBranchname'));
+my $branch_code = C4::Context->userenv->{'branch'};
 
 if ($op eq 'remove') {
     $batch = C4::Patroncards::Batch->retrieve(batch_id => $batch_id);
@@ -105,16 +104,21 @@ elsif ($op eq 'de_duplicate') {
         exit;
     }
 }
-elsif ($op = 'edit') {
+elsif ($op eq 'edit') {
     $batch = C4::Patroncards::Batch->retrieve(batch_id => $batch_id);
 }
 elsif ($op eq 'new') {
+    if ($branch_code eq '') {
+        warn sprintf('Batch edit interface called with an invalid/non-existent branch code: %s',$branch_code ? $branch_code : 'NULL');
+        print $cgi->redirect("manage.pl?card_element=batch&error=203");
+        exit;
+    }
     $batch = C4::Patroncards::Batch->new(branch_code => $branch_code);
     $batch_id = $batch->get_attr('batch_id');
 }
 else {
     warn sprintf('Batch edit interface called an unsupported operation: %s',$op);
-    print $cgi->redirect("manage.pl?card_element=batch&error=202") if $err;
+    print $cgi->redirect("manage.pl?card_element=batch&error=202");
     exit;
 }
 
@@ -129,8 +133,7 @@ $template->param(
                 table_loop              => $table,
                 duplicate_message       => $duplicate_message,
                 duplicate_count         => $duplicate_count,
-                error                   => ($errstr ? 1 : 0),
-                $errstr                 => 1,
+                error                   => $errstr,
                 );
 
 output_html_with_http_headers $cgi, $cookie, $template->output;