View | Details | Raw Unified | Return to bug 6679
Collapse All | Expand All

(-)a/labels/label-print.pl (-7 / +9 lines)
Lines 41-52 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
41
);
41
);
42
42
43
my $op = $cgi->param('op') || 'none';
43
my $op = $cgi->param('op') || 'none';
44
my @label_ids = $cgi->param('label_id') if $cgi->param('label_id');   # this will handle individual label printing
44
my @label_ids;
45
my @batch_ids = $cgi->param('batch_id') if $cgi->param('batch_id');
45
@label_ids = $cgi->param('label_id') if $cgi->param('label_id');   # this will handle individual label printing
46
my @batch_ids;
47
@batch_ids = $cgi->param('batch_id') if $cgi->param('batch_id');
46
my $layout_id = $cgi->param('layout_id') || undef;
48
my $layout_id = $cgi->param('layout_id') || undef;
47
my $template_id = $cgi->param('template_id') || undef;
49
my $template_id = $cgi->param('template_id') || undef;
48
my $start_label = $cgi->param('start_label') || 1;
50
my $start_label = $cgi->param('start_label') || 1;
49
my @item_numbers = $cgi->param('item_number') if $cgi->param('item_number');
51
my @item_numbers;
52
@item_numbers = $cgi->param('item_number') if $cgi->param('item_number');
50
my $output_format = $cgi->param('output_format') || 'pdf';
53
my $output_format = $cgi->param('output_format') || 'pdf';
51
my $referer = $cgi->param('referer') || undef;
54
my $referer = $cgi->param('referer') || undef;
52
55
Lines 109-117 elsif ($op eq 'none') { Link Here
109
    # setup select menus for selecting layout and template for this run...
112
    # setup select menus for selecting layout and template for this run...
110
    $referer = $ENV{'HTTP_REFERER'};
113
    $referer = $ENV{'HTTP_REFERER'};
111
    $referer =~ s/^.*?:\/\/.*?(\/.*)$/$1/m;
114
    $referer =~ s/^.*?:\/\/.*?(\/.*)$/$1/m;
112
    @batch_ids = grep{$_ = {batch_id => $_}} @batch_ids;
115
    @batch_ids = grep{my $id = $_; $id = {batch_id => $id}} @batch_ids;
113
    @label_ids = grep{$_ = {label_id => $_}} @label_ids;
116
    @label_ids = grep{my $id = $_; $id = {label_id => $id}} @label_ids;
114
    @item_numbers = grep{$_ = {item_number => $_}} @item_numbers;
117
    @item_numbers = grep{my $number=$_; $number = {item_number => $number}} @item_numbers;
115
    $templates = get_all_templates(field_list => 'template_id, template_code', filter => 'creator = "Labels"');
118
    $templates = get_all_templates(field_list => 'template_id, template_code', filter => 'creator = "Labels"');
116
    $layouts = get_all_layouts(field_list => 'layout_id, layout_name', filter => 'creator = "Labels"');
119
    $layouts = get_all_layouts(field_list => 'layout_id, layout_name', filter => 'creator = "Labels"');
117
    $output_formats = get_output_formats();
120
    $output_formats = get_output_formats();
118
- 

Return to bug 6679