Bug 22809: (QA follow-up) add bug description to atomicupdate

[srvgit] / labels / label-manage.pl

diff --git a/labels/label-manage.pl b/labels/label-manage.pl
index 3399c8f..762b6a2 100755 (executable)
--- a/labels/label-manage.pl
+++ b/labels/label-manage.pl
@@ -61,18 +61,19 @@ my $display_columns = { layout =>   [  # db column       => {col label
                                         {profile_id      => {label => 'Profile ID',     link_field      => 0}},
                                         {printer_name    => {label => 'Printer Name',   link_field      => 0}},
                                         {paper_bin       => {label => 'Paper Bin',      link_field      => 0}},
-                                        {_template_code  => {label => 'Template Name',  link_field      => 0}},     # this display column does not have a corrisponding db column in the profile table, hence the underscore
+                                        {_template_code  => {label => 'Template Name',  link_field      => 0}},     # this display column does not have a corresponding db column in the profile table, hence the underscore
                                         {select          => {label => 'Actions',         value           => 'profile_id'}},
                                     ],
                         batch =>    [
                                         {batch_id        => {label => 'Batch ID',       link_field      => 0}},
+                                        {description     => {label => 'Description',    link_field      => 0}},
                                         {_item_count     => {label => 'Item Count',     link_field      => 0}},
                                         {select          => {label => 'Actions',         value           => 'batch_id'}},
                                         {select1         => {label => ' ',           link_field       => 'batch_id'}},
                                     ],
 };
 
-my $label_element = $cgi->param('label_element') || 'template';   # default to template managment
+my $label_element = $cgi->param('label_element') || 'template';   # default to template management
 my $op = $cgi->param('op') || 'none';
 my $element_id = $cgi->param('element_id') || undef;
 my $error = $cgi->param('error') || 0;
@@ -87,10 +88,10 @@ if ($op eq 'delete') {
     else                                        {}      # FIXME: Some error trapping code
 }
 
-if      ($label_element eq 'layout')    {$db_rows = get_all_layouts(table_name => 'creator_layouts', filter => 'creator=\'Labels\'');}
-elsif   ($label_element eq 'template')  {$db_rows = get_all_templates(table_name => 'creator_templates', filter => 'creator=\'Labels\'');}
-elsif   ($label_element eq 'profile')   {$db_rows = get_all_profiles(table_name => 'printers_profile', filter => 'creator=\'Labels\'');}
-elsif   ($label_element eq 'batch')     {$db_rows = get_batch_summary(filter => "branch_code=\'$branch_code\' OR branch_code=\'NB\'", creator => 'Labels');}
+if      ($label_element eq 'layout')    {$db_rows = get_all_layouts( { filters => { creator => 'Labels' } });}
+elsif   ($label_element eq 'template')  {$db_rows = get_all_templates( { filters => { creator => 'Labels' } });}
+elsif   ($label_element eq 'profile')   {$db_rows = get_all_profiles( { filters => { creator => 'Labels' } });}
+elsif   ($label_element eq 'batch')     {$db_rows = get_batch_summary( { filters => { branch_code => [$branch_code, 'NB'], creator => 'Labels' } });}
 else                                    {}      # FIXME: Some error trapping code
 
 my $table = html_table($display_columns->{$label_element}, $db_rows);