[31/40] Misc bugfixes and cosmetic cleanup.

[koha.git] / labels / label-manage.pl

diff --git a/labels/label-manage.pl b/labels/label-manage.pl
index 427adad..d57df26 100755 (executable)
--- a/labels/label-manage.pl
+++ b/labels/label-manage.pl
@@ -25,6 +25,7 @@ use vars qw($debug);
 use Sys::Syslog qw(syslog);
 use CGI;
 use HTML::Template::Pro;
+use Data::Dumper;
 
 use C4::Auth qw(get_template_and_user);
 use C4::Output qw(output_html_with_http_headers);
@@ -49,34 +50,34 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
 
 my $error = 0;
 my $db_rows = {};
-my $display_columns = { layout =>   [  #db column       => display column 
-                                        {layout_id       => {label => 'Layout ID', link_field => 0}},
-                                        {layout_name     => {label => 'Layout', link_field => 0}},
-                                        {barcode_type    => {label => 'Barcode Type', link_field => 0}},
-                                        {printing_type   => {label => 'Print Type', link_field => 0}},
-                                        {format_string   => {label => 'Fields to Print', link_field => 0}},
-                                        {select          => {label => 'Select', value => 'layout_id'}},
+my $display_columns = { layout =>   [  # db column       => {col label                  is link? 
+                                        {layout_id       => {label => 'Layout ID',      link_field      => 0}},
+                                        {layout_name     => {label => 'Layout',         link_field      => 0}},
+                                        {barcode_type    => {label => 'Barcode Type',   link_field      => 0}},
+                                        {printing_type   => {label => 'Print Type',     link_field      => 0}},
+                                        {format_string   => {label => 'Fields to Print',link_field      => 0}},
+                                        {select          => {label => 'Select',         value           => 'layout_id'}},
                                     ],
-                        template => [   {template_id     => {label => 'Template ID', link_field => 0}},
-                                        {template_code   => {label => 'Template Name', link_field => 0}},
-                                        {template_desc   => {label => 'Description', link_field => 0}},
-                                        {select          => {label => 'Select', value => 'template_id'}},
+                        template => [   {template_id     => {label => 'Template ID',    link_field      => 0}},
+                                        {template_code   => {label => 'Template Name',  link_field      => 0}},
+                                        {template_desc   => {label => 'Description',    link_field      => 0}},
+                                        {select          => {label => 'Select',         value           => 'template_id'}},
                                     ],
-                        profile =>  [   {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
-                                        {select          => {label => 'Select', value => 'profile_id'}},
+                        profile =>  [   {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
+                                        {select          => {label => 'Select',         value           => 'profile_id'}},
                                     ],
-                        batch =>    [   {batch_id        => {label => 'Batch ID', link_field => 0}},
-                                        {_item_count     => {label => 'Item Count', link_field => 0}},
-                                        {select          => {label => 'Select', value => 'batch_id'}},
+                        batch =>    [   {batch_id        => {label => 'Batch ID',       link_field      => 0}},
+                                        {_item_count     => {label => 'Item Count',     link_field      => 0}},
+                                        {select          => {label => 'Select',         value           => 'batch_id'}},
                                     ],
 };
 
-my $label_element = $cgi->param('label_element');
-my $op = $cgi->param('op');
-my $element_id = $cgi->param('element_id');
+my $label_element = $cgi->param('label_element') || undef;
+my $op = $cgi->param('op') || 'none';
+my $element_id = $cgi->param('element_id') || undef;
 
 my $branch_code = ($label_element eq 'batch' ? get_branch_code_from_name($template->param('LoginBranchname')) : '');
 
@@ -91,7 +92,7 @@ if ($op eq 'delete') {
 if      ($label_element eq 'layout')    {$db_rows = get_all_layouts();}
 elsif   ($label_element eq 'template')  {$db_rows = get_all_templates();}
 elsif   ($label_element eq 'profile')   {$db_rows = get_all_profiles();}
-elsif   ($label_element eq 'batch')     {$db_rows = get_batch_summary(filter => "branch_code=\'$branch_code\'");}
+elsif   ($label_element eq 'batch')     {$db_rows = get_batch_summary(filter => "branch_code=\'$branch_code\' OR branch_code=\'NB\'");}
 else                                    {}      # FIXME: Some error trapping code
 
 my $table = html_table($display_columns->{$label_element}, $db_rows);