Adding Opac-SearchHistory feature

[koha_fer] / labels / label-edit-batch.pl

diff --git a/labels/label-edit-batch.pl b/labels/label-edit-batch.pl
index 1278df9..35c38fb 100755 (executable)
--- a/labels/label-edit-batch.pl
+++ b/labels/label-edit-batch.pl
@@ -22,9 +22,7 @@ use strict;
 use warnings;
 use vars qw($debug);
 
-use Sys::Syslog qw(syslog);
 use CGI;
-use HTML::Template::Pro;
 
 use C4::Auth qw(get_template_and_user);
 use C4::Output qw(output_html_with_http_headers);
@@ -56,7 +54,7 @@ my $display_columns = [ {_label_number  => {label => 'Label Number', link_field
                         {_barcode       => {label => 'Barcode', link_field => 0}},
                         {select         => {label => 'Select', value => '_label_id'}},
                       ];
-my $op = $cgi->param('op') || undef;
+my $op = $cgi->param('op') || 'edit';
 my $batch_id = $cgi->param('element_id') || $cgi->param('batch_id') || undef;
 my @label_ids = $cgi->param('label_id') if $cgi->param('label_id');
 my @item_numbers = $cgi->param('item_number') if $cgi->param('item_number');
@@ -80,10 +78,16 @@ elsif ($op eq 'delete') {
 elsif ($op eq 'add') {
     $batch = C4::Labels::Batch->retrieve(batch_id => $batch_id);
     $batch = C4::Labels::Batch->new(branch_code => $branch_code) if $batch == -2;
-    foreach my $item_number (@item_numbers) {
-        $err = $batch->add_item($item_number);
+    if ($branch_code){
+        foreach my $item_number (@item_numbers) {
+            $err = $batch->add_item($item_number);
+        }
+        $errstr = "item(s) not added to batch $batch_id." if $err;
+    }
+    else {
+        $err = 1;
+        $errstr = "items(s) not added, the error was: Branch is not set, you please set your branch before adding items to a batch";
     }
-    $errstr = "item(s) not added to batch $batch_id." if $err;
 }
 elsif ($op eq 'new') {
     $batch = C4::Labels::Batch->new(branch_code => $branch_code);
@@ -104,20 +108,17 @@ $db_rows = get_label_summary(items => $items, batch_id => $batch_id);
 
 my $table = html_table($display_columns, $db_rows);
 
-$template->param(
-                duplicate_message       => $duplicate_message,
-                duplicate_count         => $duplicate_count,
-                );
-
 $template->param(   
                 err         => $err,
                 errstr      => $errstr,
                 ) if ($err ne 0);
 
 $template->param(
-                op              => $op,
-                batch_id        => $batch_id,
-                table_loop      => $table,
+                op                      => $op,
+                batch_id                => $batch_id,
+                table_loop              => $table,
+                duplicate_message       => $duplicate_message,
+                duplicate_count         => $duplicate_count,
                 );
 
 output_html_with_http_headers $cgi, $cookie, $template->output;