Bug 7207 - Reverting a portion of commit 607b5449bd5cb which breaks the label export...

squashed chris_n's two patches. Label export works again. Also changed the pattern for the item_number to the known working, critic friendly pattern.

Don't change $_ in a list context

Changed the 3rd bit to the critic friendly pattern chris_n suggests in the previous two lines.

Signed-off-by: Brendan <brendan@bywatersolutions.com>

diff --git a/labels/label-print.pl b/labels/label-print.pl
index 5da731b..3947163 100755 (executable)
--- a/labels/label-print.pl
+++ b/labels/label-print.pl
@@ -112,9 +112,9 @@ elsif ($op eq 'none') {
     # setup select menus for selecting layout and template for this run...
     $referer = $ENV{'HTTP_REFERER'};
     $referer =~ s/^.*?:\/\/.*?(\/.*)$/$1/m;
-    @batch_ids = grep{my $id = $_; $id = {batch_id => $id}} @batch_ids;
-    @label_ids = grep{my $id = $_; $id = {label_id => $id}} @label_ids;
-    @item_numbers = grep{my $number=$_; $number = {item_number => $number}} @item_numbers;
+    @batch_ids = map{{batch_id => $_}} @batch_ids;
+    @label_ids = map{{label_id => $_}} @label_ids;
+    @item_numbers = map{{item_number => $_}} @item_numbers;
     $templates = get_all_templates(field_list => 'template_id, template_code', filter => 'creator = "Labels"');
     $layouts = get_all_layouts(field_list => 'layout_id, layout_name', filter => 'creator = "Labels"');
     $output_formats = get_output_formats();